faye 1.4.1 → 1.4.2

data/build/client/faye-browser.js

@@ -87,320 +87,6 @@ var Faye =
 /************************************************************************/
 /******/ ({
 
-/***/ "./node_modules/asap/browser-asap.js":
-/*!*******************************************!*\
-  !*** ./node_modules/asap/browser-asap.js ***!
-  \*******************************************/
-/*! no static exports found */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-// rawAsap provides everything we need except exception management.
-var rawAsap = __webpack_require__(/*! ./raw */ "./node_modules/asap/browser-raw.js");
-// RawTasks are recycled to reduce GC churn.
-var freeTasks = [];
-// We queue errors to ensure they are thrown in right order (FIFO).
-// Array-as-queue is good enough here, since we are just dealing with exceptions.
-var pendingErrors = [];
-var requestErrorThrow = rawAsap.makeRequestCallFromTimer(throwFirstError);
-
-function throwFirstError() {
-    if (pendingErrors.length) {
-        throw pendingErrors.shift();
-    }
-}
-
-/**
- * Calls a task as soon as possible after returning, in its own event, with priority
- * over other events like animation, reflow, and repaint. An error thrown from an
- * event will not interrupt, nor even substantially slow down the processing of
- * other events, but will be rather postponed to a lower priority event.
- * @param {{call}} task A callable object, typically a function that takes no
- * arguments.
- */
-module.exports = asap;
-function asap(task) {
-    var rawTask;
-    if (freeTasks.length) {
-        rawTask = freeTasks.pop();
-    } else {
-        rawTask = new RawTask();
-    }
-    rawTask.task = task;
-    rawAsap(rawTask);
-}
-
-// We wrap tasks with recyclable task objects.  A task object implements
-// `call`, just like a function.
-function RawTask() {
-    this.task = null;
-}
-
-// The sole purpose of wrapping the task is to catch the exception and recycle
-// the task object after its single use.
-RawTask.prototype.call = function () {
-    try {
-        this.task.call();
-    } catch (error) {
-        if (asap.onerror) {
-            // This hook exists purely for testing purposes.
-            // Its name will be periodically randomized to break any code that
-            // depends on its existence.
-            asap.onerror(error);
-        } else {
-            // In a web browser, exceptions are not fatal. However, to avoid
-            // slowing down the queue of pending tasks, we rethrow the error in a
-            // lower priority turn.
-            pendingErrors.push(error);
-            requestErrorThrow();
-        }
-    } finally {
-        this.task = null;
-        freeTasks[freeTasks.length] = this;
-    }
-};
-
-
-/***/ }),
-
-/***/ "./node_modules/asap/browser-raw.js":
-/*!******************************************!*\
-  !*** ./node_modules/asap/browser-raw.js ***!
-  \******************************************/
-/*! no static exports found */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-/* WEBPACK VAR INJECTION */(function(global) {
-
-// Use the fastest means possible to execute a task in its own turn, with
-// priority over other events including IO, animation, reflow, and redraw
-// events in browsers.
-//
-// An exception thrown by a task will permanently interrupt the processing of
-// subsequent tasks. The higher level `asap` function ensures that if an
-// exception is thrown by a task, that the task queue will continue flushing as
-// soon as possible, but if you use `rawAsap` directly, you are responsible to
-// either ensure that no exceptions are thrown from your task, or to manually
-// call `rawAsap.requestFlush` if an exception is thrown.
-module.exports = rawAsap;
-function rawAsap(task) {
-    if (!queue.length) {
-        requestFlush();
-        flushing = true;
-    }
-    // Equivalent to push, but avoids a function call.
-    queue[queue.length] = task;
-}
-
-var queue = [];
-// Once a flush has been requested, no further calls to `requestFlush` are
-// necessary until the next `flush` completes.
-var flushing = false;
-// `requestFlush` is an implementation-specific method that attempts to kick
-// off a `flush` event as quickly as possible. `flush` will attempt to exhaust
-// the event queue before yielding to the browser's own event loop.
-var requestFlush;
-// The position of the next task to execute in the task queue. This is
-// preserved between calls to `flush` so that it can be resumed if
-// a task throws an exception.
-var index = 0;
-// If a task schedules additional tasks recursively, the task queue can grow
-// unbounded. To prevent memory exhaustion, the task queue will periodically
-// truncate already-completed tasks.
-var capacity = 1024;
-
-// The flush function processes all tasks that have been scheduled with
-// `rawAsap` unless and until one of those tasks throws an exception.
-// If a task throws an exception, `flush` ensures that its state will remain
-// consistent and will resume where it left off when called again.
-// However, `flush` does not make any arrangements to be called again if an
-// exception is thrown.
-function flush() {
-    while (index < queue.length) {
-        var currentIndex = index;
-        // Advance the index before calling the task. This ensures that we will
-        // begin flushing on the next task the task throws an error.
-        index = index + 1;
-        queue[currentIndex].call();
-        // Prevent leaking memory for long chains of recursive calls to `asap`.
-        // If we call `asap` within tasks scheduled by `asap`, the queue will
-        // grow, but to avoid an O(n) walk for every task we execute, we don't
-        // shift tasks off the queue after they have been executed.
-        // Instead, we periodically shift 1024 tasks off the queue.
-        if (index > capacity) {
-            // Manually shift all values starting at the index back to the
-            // beginning of the queue.
-            for (var scan = 0, newLength = queue.length - index; scan < newLength; scan++) {
-                queue[scan] = queue[scan + index];
-            }
-            queue.length -= index;
-            index = 0;
-        }
-    }
-    queue.length = 0;
-    index = 0;
-    flushing = false;
-}
-
-// `requestFlush` is implemented using a strategy based on data collected from
-// every available SauceLabs Selenium web driver worker at time of writing.
-// https://docs.google.com/spreadsheets/d/1mG-5UYGup5qxGdEMWkhP6BWCz053NUb2E1QoUTU16uA/edit#gid=783724593
-
-// Safari 6 and 6.1 for desktop, iPad, and iPhone are the only browsers that
-// have WebKitMutationObserver but not un-prefixed MutationObserver.
-// Must use `global` or `self` instead of `window` to work in both frames and web
-// workers. `global` is a provision of Browserify, Mr, Mrs, or Mop.
-
-/* globals self */
-var scope = typeof global !== "undefined" ? global : self;
-var BrowserMutationObserver = scope.MutationObserver || scope.WebKitMutationObserver;
-
-// MutationObservers are desirable because they have high priority and work
-// reliably everywhere they are implemented.
-// They are implemented in all modern browsers.
-//
-// - Android 4-4.3
-// - Chrome 26-34
-// - Firefox 14-29
-// - Internet Explorer 11
-// - iPad Safari 6-7.1
-// - iPhone Safari 7-7.1
-// - Safari 6-7
-if (typeof BrowserMutationObserver === "function") {
-    requestFlush = makeRequestCallFromMutationObserver(flush);
-
-// MessageChannels are desirable because they give direct access to the HTML
-// task queue, are implemented in Internet Explorer 10, Safari 5.0-1, and Opera
-// 11-12, and in web workers in many engines.
-// Although message channels yield to any queued rendering and IO tasks, they
-// would be better than imposing the 4ms delay of timers.
-// However, they do not work reliably in Internet Explorer or Safari.
-
-// Internet Explorer 10 is the only browser that has setImmediate but does
-// not have MutationObservers.
-// Although setImmediate yields to the browser's renderer, it would be
-// preferrable to falling back to setTimeout since it does not have
-// the minimum 4ms penalty.
-// Unfortunately there appears to be a bug in Internet Explorer 10 Mobile (and
-// Desktop to a lesser extent) that renders both setImmediate and
-// MessageChannel useless for the purposes of ASAP.
-// https://github.com/kriskowal/q/issues/396
-
-// Timers are implemented universally.
-// We fall back to timers in workers in most engines, and in foreground
-// contexts in the following browsers.
-// However, note that even this simple case requires nuances to operate in a
-// broad spectrum of browsers.
-//
-// - Firefox 3-13
-// - Internet Explorer 6-9
-// - iPad Safari 4.3
-// - Lynx 2.8.7
-} else {
-    requestFlush = makeRequestCallFromTimer(flush);
-}
-
-// `requestFlush` requests that the high priority event queue be flushed as
-// soon as possible.
-// This is useful to prevent an error thrown in a task from stalling the event
-// queue if the exception handled by Node.js’s
-// `process.on("uncaughtException")` or by a domain.
-rawAsap.requestFlush = requestFlush;
-
-// To request a high priority event, we induce a mutation observer by toggling
-// the text of a text node between "1" and "-1".
-function makeRequestCallFromMutationObserver(callback) {
-    var toggle = 1;
-    var observer = new BrowserMutationObserver(callback);
-    var node = document.createTextNode("");
-    observer.observe(node, {characterData: true});
-    return function requestCall() {
-        toggle = -toggle;
-        node.data = toggle;
-    };
-}
-
-// The message channel technique was discovered by Malte Ubl and was the
-// original foundation for this library.
-// http://www.nonblocking.io/2011/06/windownexttick.html
-
-// Safari 6.0.5 (at least) intermittently fails to create message ports on a
-// page's first load. Thankfully, this version of Safari supports
-// MutationObservers, so we don't need to fall back in that case.
-
-// function makeRequestCallFromMessageChannel(callback) {
-//     var channel = new MessageChannel();
-//     channel.port1.onmessage = callback;
-//     return function requestCall() {
-//         channel.port2.postMessage(0);
-//     };
-// }
-
-// For reasons explained above, we are also unable to use `setImmediate`
-// under any circumstances.
-// Even if we were, there is another bug in Internet Explorer 10.
-// It is not sufficient to assign `setImmediate` to `requestFlush` because
-// `setImmediate` must be called *by name* and therefore must be wrapped in a
-// closure.
-// Never forget.
-
-// function makeRequestCallFromSetImmediate(callback) {
-//     return function requestCall() {
-//         setImmediate(callback);
-//     };
-// }
-
-// Safari 6.0 has a problem where timers will get lost while the user is
-// scrolling. This problem does not impact ASAP because Safari 6.0 supports
-// mutation observers, so that implementation is used instead.
-// However, if we ever elect to use timers in Safari, the prevalent work-around
-// is to add a scroll event listener that calls for a flush.
-
-// `setTimeout` does not call the passed callback if the delay is less than
-// approximately 7 in web workers in Firefox 8 through 18, and sometimes not
-// even then.
-
-function makeRequestCallFromTimer(callback) {
-    return function requestCall() {
-        // We dispatch a timeout with a specified delay of 0 for engines that
-        // can reliably accommodate that request. This will usually be snapped
-        // to a 4 milisecond delay, but once we're flushing, there's no delay
-        // between events.
-        var timeoutHandle = setTimeout(handleTimer, 0);
-        // However, since this timer gets frequently dropped in Firefox
-        // workers, we enlist an interval handle that will try to fire
-        // an event 20 times per second until it succeeds.
-        var intervalHandle = setInterval(handleTimer, 50);
-
-        function handleTimer() {
-            // Whichever timer succeeds will cancel both timers and
-            // execute the callback.
-            clearTimeout(timeoutHandle);
-            clearInterval(intervalHandle);
-            callback();
-        }
-    };
-}
-
-// This is for `asap.js` only.
-// Its name will be periodically randomized to break any code that depends on
-// its existence.
-rawAsap.makeRequestCallFromTimer = makeRequestCallFromTimer;
-
-// ASAP was originally a nextTick shim included in Q. This was factored out
-// into this ASAP package. It was later adapted to RSVP which made further
-// amendments. These decisions, particularly to marginalize MessageChannel and
-// to capture the MutationObserver implementation in a closure, were integrated
-// back into ASAP proper.
-// https://github.com/tildeio/rsvp.js/blob/cddf7232546a9cf858524b75cde6f9edf72620a7/lib/rsvp/asap.js
-
-/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./../webpack/buildin/global.js */ "./node_modules/webpack/buildin/global.js")))
-
-/***/ }),
-
 /***/ "./node_modules/webpack/buildin/global.js":
 /*!***********************************!*\
   !*** (webpack)/buildin/global.js ***!
@@ -469,28 +155,31 @@ module.exports = Faye;
 "use strict";
 /* WEBPACK VAR INJECTION */(function(global) {
 
-var Promise   = __webpack_require__(/*! ../util/promise */ "./src/util/promise.js");
-
 module.exports = {
   then: function(callback, errback) {
     var self = this;
-    if (!this._promise)
+
+    if (!this._promise) {
       this._promise = new Promise(function(resolve, reject) {
         self._resolve = resolve;
         self._reject  = reject;
       });
+    }
 
-    if (arguments.length === 0)
+    if (arguments.length === 0) {
       return this._promise;
-    else
+    } else {
       return this._promise.then(callback, errback);
+    }
   },
 
   callback: function(callback, context) {
+    if (!callback) return;
     return this.then(function(value) { callback.call(context, value) });
   },
 
   errback: function(callback, context) {
+    if (!callback) return;
     return this.then(null, function(reason) { callback.call(context, reason) });
   },
 
@@ -507,12 +196,13 @@ module.exports = {
 
     this.then();
 
-    if (status === 'succeeded')
+    if (status === 'succeeded') {
       this._resolve(value);
-    else if (status === 'failed')
+    } else if (status === 'failed') {
       this._reject(value);
-    else
+    } else {
       delete this._promise;
+    }
   }
 };
 
@@ -560,19 +250,19 @@ var Logging = {
     if (klass) banner += '.' + klass;
     banner += '] ';
 
-    if (typeof logger[level] === 'function')
+    if (typeof logger[level] === 'function') {
       logger[level](banner + message);
-    else if (typeof logger === 'function')
+    } else if (typeof logger === 'function') {
       logger(banner + message);
+    }
   }
 };
 
-for (var key in Logging.LOG_LEVELS)
-  (function(level) {
-    Logging[level] = function() {
-      this.writeLog(arguments, level);
-    };
-  })(key);
+for (let level of Object.keys(Logging.LOG_LEVELS)) {
+  Logging[level] = function() {
+    this.writeLog(arguments, level);
+  };
+}
 
 module.exports = Logging;
 
@@ -589,8 +279,7 @@ module.exports = Logging;
 "use strict";
 
 
-var assign       = __webpack_require__(/*! ../util/assign */ "./src/util/assign.js"),
-    EventEmitter = __webpack_require__(/*! ../util/event_emitter */ "./src/util/event_emitter.js");
+var EventEmitter = __webpack_require__(/*! ../util/event_emitter */ "./src/util/event_emitter.js");
 
 var Publisher = {
   countListeners: function(eventType) {
@@ -620,7 +309,7 @@ var Publisher = {
   }
 };
 
-assign(Publisher, EventEmitter.prototype);
+Object.assign(Publisher, EventEmitter.prototype);
 Publisher.trigger = Publisher.emit;
 
 module.exports = Publisher;
@@ -640,26 +329,26 @@ module.exports = Publisher;
 
 module.exports = {
   addTimeout: function(name, delay, callback, context) {
-    this._timeouts = this._timeouts || {};
-    if (this._timeouts.hasOwnProperty(name)) return;
+    this._timeouts = this._timeouts || new Map();
+    if (this._timeouts.has(name)) return;
     var self = this;
-    this._timeouts[name] = global.setTimeout(function() {
+    this._timeouts.set(name, global.setTimeout(function() {
       delete self._timeouts[name];
       callback.call(context);
-    }, 1000 * delay);
+    }, 1000 * delay));
   },
 
   removeTimeout: function(name) {
-    this._timeouts = this._timeouts || {};
-    var timeout = this._timeouts[name];
+    this._timeouts = this._timeouts || new Map();
+    var timeout = this._timeouts.get(name);
     if (!timeout) return;
     global.clearTimeout(timeout);
-    delete this._timeouts[name];
+    this._timeouts.delete(name);
   },
 
   removeAllTimeouts: function() {
-    this._timeouts = this._timeouts || {};
-    for (var name in this._timeouts) this.removeTimeout(name);
+    this._timeouts = this._timeouts || new Map();
+    for (let name of this._timeouts.keys()) this.removeTimeout(name);
   }
 };
 
@@ -678,7 +367,6 @@ module.exports = {
 
 
 var Class     = __webpack_require__(/*! ../util/class */ "./src/util/class.js"),
-    assign    = __webpack_require__(/*! ../util/assign */ "./src/util/assign.js"),
     Publisher = __webpack_require__(/*! ../mixins/publisher */ "./src/mixins/publisher.js"),
     Grammar   = __webpack_require__(/*! ./grammar */ "./src/protocol/grammar.js");
 
@@ -696,9 +384,9 @@ var Channel = Class({
   }
 });
 
-assign(Channel.prototype, Publisher);
+Object.assign(Channel.prototype, Publisher);
 
-assign(Channel, {
+Object.assign(Channel, {
   HANDSHAKE:    '/meta/handshake',
   CONNECT:      '/meta/connect',
   SUBSCRIBE:    '/meta/subscribe',
@@ -756,17 +444,15 @@ assign(Channel, {
 
   Set: Class({
     initialize: function() {
-      this._channels = {};
+      this._channels = new Map();
     },
 
     getKeys: function() {
-      var keys = [];
-      for (var key in this._channels) keys.push(key);
-      return keys;
+      return [...this._channels.keys()];
     },
 
     remove: function(name) {
-      delete this._channels[name];
+      this._channels.delete(name);
     },
 
     hasSubscription: function(name) {
@@ -774,16 +460,14 @@ assign(Channel, {
     },
 
     subscribe: function(names, subscription) {
-      var name;
-      for (var i = 0, n = names.length; i < n; i++) {
-        name = names[i];
-        var channel = this._channels[name] = this._channels[name] || new Channel(name);
-        channel.bind('message', subscription);
+      for (let name of names) {
+        if (!this._channels.has(name)) this._channels.set(name, new Channel(name));
+        this._channels.get(name).bind('message', subscription);
       }
     },
 
     unsubscribe: function(name, subscription) {
-      var channel = this._channels[name];
+      var channel = this._channels.get(name);
       if (!channel) return false;
       channel.unbind('message', subscription);
 
@@ -798,8 +482,8 @@ assign(Channel, {
     distributeMessage: function(message) {
       var channels = Channel.expand(message.channel);
 
-      for (var i = 0, n = channels.length; i < n; i++) {
-        var channel = this._channels[channels[i]];
+      for (let chan of channels) {
+        var channel = this._channels.get(chan);
         if (channel) channel.trigger('message', message);
       }
     }
@@ -821,13 +505,10 @@ module.exports = Channel;
 "use strict";
 /* WEBPACK VAR INJECTION */(function(global) {
 
-var asap            = __webpack_require__(/*! asap */ "./node_modules/asap/browser-asap.js"),
-    Class           = __webpack_require__(/*! ../util/class */ "./src/util/class.js"),
-    Promise         = __webpack_require__(/*! ../util/promise */ "./src/util/promise.js"),
+var Class           = __webpack_require__(/*! ../util/class */ "./src/util/class.js"),
     array           = __webpack_require__(/*! ../util/array */ "./src/util/array.js"),
     browser         = __webpack_require__(/*! ../util/browser */ "./src/util/browser/event.js"),
     constants       = __webpack_require__(/*! ../util/constants */ "./src/util/constants.js"),
-    assign          = __webpack_require__(/*! ../util/assign */ "./src/util/assign.js"),
     validateOptions = __webpack_require__(/*! ../util/validate_options */ "./src/util/validate_options.js"),
     Deferrable      = __webpack_require__(/*! ../mixins/deferrable */ "./src/mixins/deferrable.js"),
     Logging         = __webpack_require__(/*! ../mixins/logging */ "./src/mixins/logging.js"),
@@ -866,7 +547,7 @@ var Client = Class({ className: 'Client',
     this._messageId = 0;
     this._state     = this.UNCONNECTED;
 
-    this._responseCallbacks = {};
+    this._responseCallbacks = new Map();
 
     this._advice = {
       reconnect: this.RETRY,
@@ -877,11 +558,13 @@ var Client = Class({ className: 'Client',
 
     this._dispatcher.bind('message', this._receiveMessage, this);
 
-    if (browser.Event && global.onbeforeunload !== undefined)
+    if (browser.Event && global.onbeforeunload !== undefined) {
       browser.Event.on(global, 'beforeunload', function() {
-        if (array.indexOf(this._dispatcher._disabled, 'autodisconnect') < 0)
+        if (array.indexOf(this._dispatcher._disabled, 'autodisconnect') < 0) {
           this.disconnect();
+        }
       }, this);
+    }
   },
 
   addWebsocketExtension: function(extension) {
@@ -941,7 +624,7 @@ var Client = Class({ className: 'Client',
         this.info('Handshake successful: ?', this._dispatcher.clientId);
 
         this.subscribe(this._channels.getKeys(), true);
-        if (callback) asap(function() { callback.call(context) });
+        if (callback) Promise.resolve().then(function() { callback.call(context) });
 
       } else {
         this.info('Handshake unsuccessful');
@@ -964,8 +647,9 @@ var Client = Class({ className: 'Client',
     if (this._advice.reconnect === this.NONE) return;
     if (this._state === this.DISCONNECTED) return;
 
-    if (this._state === this.UNCONNECTED)
+    if (this._state === this.UNCONNECTED) {
       return this.handshake(function() { this.connect(callback, context) }, this);
+    }
 
     this.callback(callback, context);
     if (this._state !== this.CONNECTED) return;
@@ -1031,10 +715,11 @@ var Client = Class({ className: 'Client',
   //                                                     * id
   //                                                     * timestamp
   subscribe: function(channel, callback, context) {
-    if (channel instanceof Array)
+    if (channel instanceof Array) {
       return array.map(channel, function(c) {
         return this.subscribe(c, callback, context);
       }, this);
+    }
 
     var subscription = new Subscription(this, channel, callback, context),
         force        = (callback === true),
@@ -1081,10 +766,11 @@ var Client = Class({ className: 'Client',
   //                                                     * id
   //                                                     * timestamp
   unsubscribe: function(channel, subscription) {
-    if (channel instanceof Array)
+    if (channel instanceof Array) {
       return array.map(channel, function(c) {
         return this.unsubscribe(c, subscription);
       }, this);
+    }
 
     var dead = this._channels.unsubscribe(channel, subscription);
     if (!dead) return;
@@ -1125,10 +811,11 @@ var Client = Class({ className: 'Client',
         clientId: this._dispatcher.clientId
 
       }, options, function(response) {
-        if (response.successful)
+        if (response.successful) {
           publication.setDeferredStatus('succeeded');
-        else
+        } else {
           publication.setDeferredStatus('failed', Error.parse(response.error));
+        }
       }, this);
     }, this);
 
@@ -1144,7 +831,7 @@ var Client = Class({ className: 'Client',
 
     this.pipeThroughExtensions('outgoing', message, null, function(message) {
       if (!message) return;
-      if (callback) this._responseCallbacks[message.id] = [callback, context];
+      if (callback) this._responseCallbacks.set(message.id, [callback, context]);
       this._dispatcher.sendMessage(message, timeout, options || {});
     }, this);
   },
@@ -1159,8 +846,8 @@ var Client = Class({ className: 'Client',
     var id = message.id, callback;
 
     if (message.successful !== undefined) {
-      callback = this._responseCallbacks[id];
-      delete this._responseCallbacks[id];
+      callback = this._responseCallbacks.get(id);
+      this._responseCallbacks.delete(id);
     }
 
     this.pipeThroughExtensions('incoming', message, null, function(message) {
@@ -1172,7 +859,7 @@ var Client = Class({ className: 'Client',
   },
 
   _handleAdvice: function(advice) {
-    assign(this._advice, advice);
+    Object.assign(this._advice, advice);
     this._dispatcher.timeout = this._advice.timeout / 1000;
 
     if (this._advice.reconnect === this.HANDSHAKE && this._state !== this.DISCONNECTED) {
@@ -1198,10 +885,10 @@ var Client = Class({ className: 'Client',
   }
 });
 
-assign(Client.prototype, Deferrable);
-assign(Client.prototype, Publisher);
-assign(Client.prototype, Logging);
-assign(Client.prototype, Extensible);
+Object.assign(Client.prototype, Deferrable);
+Object.assign(Client.prototype, Publisher);
+Object.assign(Client.prototype, Logging);
+Object.assign(Client.prototype, Extensible);
 
 module.exports = Client;
 
@@ -1222,7 +909,6 @@ module.exports = Client;
 var Class     = __webpack_require__(/*! ../util/class */ "./src/util/class.js"),
     URI       = __webpack_require__(/*! ../util/uri */ "./src/util/uri.js"),
     cookies   = __webpack_require__(/*! ../util/cookies */ "./src/util/cookies/browser_cookies.js"),
-    assign    = __webpack_require__(/*! ../util/assign */ "./src/util/assign.js"),
     Logging   = __webpack_require__(/*! ../mixins/logging */ "./src/mixins/logging.js"),
     Publisher = __webpack_require__(/*! ../mixins/publisher */ "./src/mixins/publisher.js"),
     Transport = __webpack_require__(/*! ../transport */ "./src/transport/browser_transports.js"),
@@ -1242,7 +928,7 @@ var Dispatcher = Class({ className: 'Dispatcher',
 
     this.cookies      = cookies.CookieJar && new cookies.CookieJar();
     this._disabled    = [];
-    this._envelopes   = {};
+    this._envelopes   = new Map();
     this.headers      = {};
     this.retry        = options.retry || this.DEFAULT_RETRY;
     this._scheduler   = options.scheduler || Scheduler;
@@ -1256,15 +942,15 @@ var Dispatcher = Class({ className: 'Dispatcher',
     var exts = options.websocketExtensions;
     if (exts) {
       exts = [].concat(exts);
-      for (var i = 0, n = exts.length; i < n; i++)
-        this.addWebsocketExtension(exts[i]);
+      for (let ext of exts) this.addWebsocketExtension(ext);
     }
 
     this.tls = options.tls || {};
     this.tls.ca = this.tls.ca || options.ca;
 
-    for (var type in this._alternates)
-      this._alternates[type] = URI.parse(this._alternates[type]);
+    for (let [type, alt] of Object.entries(this._alternates)) {
+      this._alternates[type] = URI.parse(alt);
+    }
 
     this.maxRequestSize = this.MAX_REQUEST_SIZE;
   },
@@ -1314,12 +1000,13 @@ var Dispatcher = Class({ className: 'Dispatcher',
     var id       = message.id,
         attempts = options.attempts,
         deadline = options.deadline && new Date().getTime() + (options.deadline * 1000),
-        envelope = this._envelopes[id],
+        envelope = this._envelopes.get(id),
         scheduler;
 
     if (!envelope) {
       scheduler = new this._scheduler(message, { timeout: timeout, interval: this.retry, attempts: attempts, deadline: deadline });
-      envelope  = this._envelopes[id] = { message: message, scheduler: scheduler };
+      envelope = { message: message, scheduler: scheduler };
+      this._envelopes.set(id, envelope);
     }
 
     this._sendEnvelope(envelope);
@@ -1335,7 +1022,7 @@ var Dispatcher = Class({ className: 'Dispatcher',
 
     if (!scheduler.isDeliverable()) {
       scheduler.abort();
-      delete this._envelopes[message.id];
+      this._envelopes.delete(message.id);
       return;
     }
 
@@ -1348,11 +1035,11 @@ var Dispatcher = Class({ className: 'Dispatcher',
   },
 
   handleResponse: function(reply) {
-    var envelope = this._envelopes[reply.id];
+    var envelope = this._envelopes.get(reply.id);
 
     if (reply.successful !== undefined && envelope) {
       envelope.scheduler.succeed();
-      delete this._envelopes[reply.id];
+      this._envelopes.delete(reply.id);
       global.clearTimeout(envelope.timer);
     }
 
@@ -1364,7 +1051,7 @@ var Dispatcher = Class({ className: 'Dispatcher',
   },
 
   handleError: function(message, immediate) {
-    var envelope = this._envelopes[message.id],
+    var envelope = this._envelopes.get(message.id),
         request  = envelope && envelope.request,
         self     = this;
 
@@ -1399,8 +1086,8 @@ Dispatcher.create = function(client, endpoint, options) {
   return new Dispatcher(client, endpoint, options);
 };
 
-assign(Dispatcher.prototype, Publisher);
-assign(Dispatcher.prototype, Logging);
+Object.assign(Dispatcher.prototype, Publisher);
+Object.assign(Dispatcher.prototype, Logging);
 
 module.exports = Dispatcher;
 
@@ -1463,12 +1150,11 @@ var errors = {
   serverError:      [500, 'Internal server error']
 };
 
-for (var name in errors)
-  (function(name) {
-    Error[name] = function() {
-      return new Error(errors[name][0], arguments, errors[name][1]).toString();
-    };
-  })(name);
+for (let [name, [status, msg]] of Object.entries(errors)) {
+  Error[name] = function() {
+    return new Error(status, arguments, msg).toString();
+  };
+}
 
 module.exports = Error;
 
@@ -1485,8 +1171,7 @@ module.exports = Error;
 "use strict";
 
 
-var assign  = __webpack_require__(/*! ../util/assign */ "./src/util/assign.js"),
-    Logging = __webpack_require__(/*! ../mixins/logging */ "./src/mixins/logging.js");
+var Logging = __webpack_require__(/*! ../mixins/logging */ "./src/mixins/logging.js");
 
 var Extensible = {
   addExtension: function(extension) {
@@ -1527,7 +1212,7 @@ var Extensible = {
   }
 };
 
-assign(Extensible, Logging);
+Object.assign(Extensible, Logging);
 
 module.exports = Extensible;
 
@@ -1582,15 +1267,13 @@ module.exports = Class(Deferrable);
 "use strict";
 
 
-var assign = __webpack_require__(/*! ../util/assign */ "./src/util/assign.js");
-
 var Scheduler = function(message, options) {
   this.message  = message;
   this.options  = options;
   this.attempts = 0;
 };
 
-assign(Scheduler.prototype, {
+Object.assign(Scheduler.prototype, {
   getTimeout: function() {
     return this.options.timeout;
   },
@@ -1605,11 +1288,12 @@ assign(Scheduler.prototype, {
         deadline = this.options.deadline,
         now      = new Date().getTime();
 
-    if (attempts !== undefined && made >= attempts)
+    if (attempts !== undefined && made >= attempts) {
       return false;
-
-    if (deadline !== undefined && now > deadline)
+    }
+    if (deadline !== undefined && now > deadline) {
       return false;
+    }
 
     return true;
   },
@@ -1641,7 +1325,6 @@ module.exports = Scheduler;
 
 
 var Class      = __webpack_require__(/*! ../util/class */ "./src/util/class.js"),
-    assign     = __webpack_require__(/*! ../util/assign */ "./src/util/assign.js"),
     Deferrable = __webpack_require__(/*! ../mixins/deferrable */ "./src/mixins/deferrable.js");
 
 var Subscription = Class({
@@ -1661,11 +1344,12 @@ var Subscription = Class({
   apply: function(context, args) {
     var message = args[0];
 
-    if (this._callback)
+    if (this._callback) {
       this._callback.call(this._context, message.data);
-
-    if (this._withChannel)
+    }
+    if (this._withChannel) {
       this._withChannel[0].call(this._withChannel[1], message.channel, message.data);
+    }
   },
 
   cancel: function() {
@@ -1679,7 +1363,7 @@ var Subscription = Class({
   }
 });
 
-assign(Subscription.prototype, Deferrable);
+Object.assign(Subscription.prototype, Deferrable);
 
 module.exports = Subscription;
 
@@ -1722,11 +1406,10 @@ module.exports = Transport;
 var Class     = __webpack_require__(/*! ../util/class */ "./src/util/class.js"),
     Set       = __webpack_require__(/*! ../util/set */ "./src/util/set.js"),
     URI       = __webpack_require__(/*! ../util/uri */ "./src/util/uri.js"),
-    assign    = __webpack_require__(/*! ../util/assign */ "./src/util/assign.js"),
     toJSON    = __webpack_require__(/*! ../util/to_json */ "./src/util/to_json.js"),
     Transport = __webpack_require__(/*! ./transport */ "./src/transport/transport.js");
 
-var CORS = assign(Class(Transport, {
+var CORS = Object.assign(Class(Transport, {
   encode: function(messages) {
     return 'message=' + encodeURIComponent(toJSON(messages));
   },
@@ -1736,17 +1419,15 @@ var CORS = assign(Class(Transport, {
         xhr      = new xhrClass(),
         id       = ++CORS._id,
         headers  = this._dispatcher.headers,
-        self     = this,
-        key;
+        self     = this;
 
     xhr.open('POST', this.endpoint.href, true);
     xhr.withCredentials = true;
 
     if (xhr.setRequestHeader) {
       xhr.setRequestHeader('Pragma', 'no-cache');
-      for (key in headers) {
-        if (!headers.hasOwnProperty(key)) continue;
-        xhr.setRequestHeader(key, headers[key]);
+      for (let [key, value] of Object.entries(headers)) {
+        xhr.setRequestHeader(key, value);
       }
     }
 
@@ -1763,10 +1444,11 @@ var CORS = assign(Class(Transport, {
 
       cleanUp();
 
-      if (replies)
+      if (replies) {
         self._receive(replies);
-      else
+      } else {
         self._handleError(messages);
+      }
     };
 
     xhr.onerror = xhr.ontimeout = function() {
@@ -1776,8 +1458,9 @@ var CORS = assign(Class(Transport, {
 
     xhr.onprogress = function() {};
 
-    if (xhrClass === global.XDomainRequest)
+    if (xhrClass === global.XDomainRequest) {
       CORS._pending.add({ id: id, xhr: xhr });
+    }
 
     xhr.send(this.encode(messages));
     return xhr;
@@ -1787,12 +1470,12 @@ var CORS = assign(Class(Transport, {
   _pending: new Set(),
 
   isUsable: function(dispatcher, endpoint, callback, context) {
-    if (URI.isSameOrigin(endpoint))
+    if (URI.isSameOrigin(endpoint)) {
       return callback.call(context, false);
-
-    if (global.XDomainRequest)
+    }
+    if (global.XDomainRequest) {
       return callback.call(context, endpoint.protocol === location.protocol);
-
+    }
     if (global.XMLHttpRequest) {
       var xhr = new XMLHttpRequest();
       return callback.call(context, xhr.withCredentials !== undefined);
@@ -1819,20 +1502,18 @@ module.exports = CORS;
 
 var Class      = __webpack_require__(/*! ../util/class */ "./src/util/class.js"),
     URI        = __webpack_require__(/*! ../util/uri */ "./src/util/uri.js"),
-    copyObject = __webpack_require__(/*! ../util/copy_object */ "./src/util/copy_object.js"),
-    assign     = __webpack_require__(/*! ../util/assign */ "./src/util/assign.js"),
     Deferrable = __webpack_require__(/*! ../mixins/deferrable */ "./src/mixins/deferrable.js"),
     Transport  = __webpack_require__(/*! ./transport */ "./src/transport/transport.js"),
     XHR        = __webpack_require__(/*! ./xhr */ "./src/transport/xhr.js");
 
-var EventSource = assign(Class(Transport, {
+var EventSource = Object.assign(Class(Transport, {
   initialize: function(dispatcher, endpoint) {
     Transport.prototype.initialize.call(this, dispatcher, endpoint);
     if (!global.EventSource) return this.setDeferredStatus('failed');
 
     this._xhr = new XHR(dispatcher, endpoint);
 
-    endpoint = copyObject(endpoint);
+    endpoint = URI.clone(endpoint);
     endpoint.pathname += '/' + dispatcher.clientId;
 
     var socket = new global.EventSource(URI.stringify(endpoint)),
@@ -1856,10 +1537,11 @@ var EventSource = assign(Class(Transport, {
       var replies;
       try { replies = JSON.parse(event.data) } catch (error) {}
 
-      if (replies)
+      if (replies) {
         self._receive(replies);
-      else
+      } else {
         self._handleError([]);
+      }
     };
 
     this._socket = socket;
@@ -1897,19 +1579,20 @@ var EventSource = assign(Class(Transport, {
   },
 
   create: function(dispatcher, endpoint) {
-    var sockets = dispatcher.transports.eventsource = dispatcher.transports.eventsource || {},
-        id      = dispatcher.clientId;
+    var transports = dispatcher.transports,
+        sockets    = transports.eventsource = transports.eventsource || new Map(),
+        id         = dispatcher.clientId;
 
-    var url = copyObject(endpoint);
+    var url = URI.clone(endpoint);
     url.pathname += '/' + (id || '');
     url = URI.stringify(url);
 
-    sockets[url] = sockets[url] || new this(dispatcher, endpoint);
-    return sockets[url];
+    if (!sockets.has(url)) sockets.set(url, new this(dispatcher, endpoint));
+    return sockets.get(url);
   }
 });
 
-assign(EventSource.prototype, Deferrable);
+Object.assign(EventSource.prototype, Deferrable);
 
 module.exports = EventSource;
 
@@ -1927,18 +1610,16 @@ module.exports = EventSource;
 "use strict";
 /* WEBPACK VAR INJECTION */(function(global) {
 
-var Class      = __webpack_require__(/*! ../util/class */ "./src/util/class.js"),
-    URI        = __webpack_require__(/*! ../util/uri */ "./src/util/uri.js"),
-    copyObject = __webpack_require__(/*! ../util/copy_object */ "./src/util/copy_object.js"),
-    assign     = __webpack_require__(/*! ../util/assign */ "./src/util/assign.js"),
-    toJSON     = __webpack_require__(/*! ../util/to_json */ "./src/util/to_json.js"),
-    Transport  = __webpack_require__(/*! ./transport */ "./src/transport/transport.js");
+var Class     = __webpack_require__(/*! ../util/class */ "./src/util/class.js"),
+    URI       = __webpack_require__(/*! ../util/uri */ "./src/util/uri.js"),
+    toJSON    = __webpack_require__(/*! ../util/to_json */ "./src/util/to_json.js"),
+    Transport = __webpack_require__(/*! ./transport */ "./src/transport/transport.js");
 
-var JSONP = assign(Class(Transport, {
- encode: function(messages) {
-    var url = copyObject(this.endpoint);
-    url.query.message = toJSON(messages);
-    url.query.jsonp   = '__jsonp' + JSONP._cbCount + '__';
+var JSONP = Object.assign(Class(Transport, {
+  encode: function(messages) {
+    var url = URI.clone(this.endpoint);
+    url.searchParams.set('message', toJSON(messages));
+    url.searchParams.set('jsonp', '__jsonp' + JSONP._cbCount + '__');
     return URI.stringify(url);
   },
 
@@ -1946,11 +1627,11 @@ var JSONP = assign(Class(Transport, {
     var head         = document.getElementsByTagName('head')[0],
         script       = document.createElement('script'),
         callbackName = JSONP.getCallbackName(),
-        endpoint     = copyObject(this.endpoint),
+        endpoint     = URI.clone(this.endpoint),
         self         = this;
 
-    endpoint.query.message = toJSON(messages);
-    endpoint.query.jsonp   = callbackName;
+    endpoint.searchParams.set('message', toJSON(messages));
+    endpoint.searchParams.set('jsonp', callbackName);
 
     var cleanup = function() {
       if (!global[callbackName]) return false;
@@ -2006,14 +1687,12 @@ module.exports = JSONP;
 
 var Class    = __webpack_require__(/*! ../util/class */ "./src/util/class.js"),
     Cookie   = __webpack_require__(/*! ../util/cookies */ "./src/util/cookies/browser_cookies.js").Cookie,
-    Promise  = __webpack_require__(/*! ../util/promise */ "./src/util/promise.js"),
     array    = __webpack_require__(/*! ../util/array */ "./src/util/array.js"),
-    assign   = __webpack_require__(/*! ../util/assign */ "./src/util/assign.js"),
     Logging  = __webpack_require__(/*! ../mixins/logging */ "./src/mixins/logging.js"),
     Timeouts = __webpack_require__(/*! ../mixins/timeouts */ "./src/mixins/timeouts.js"),
     Channel  = __webpack_require__(/*! ../protocol/channel */ "./src/protocol/channel.js");
 
-var Transport = assign(Class({ className: 'Transport',
+var Transport = Object.assign(Class({ className: 'Transport',
   DEFAULT_PORTS: { 'http:': 80, 'https:': 443, 'ws:': 80, 'wss:': 443 },
   MAX_DELAY:     0,
 
@@ -2023,10 +1702,11 @@ var Transport = assign(Class({ className: 'Transport',
     this._dispatcher = dispatcher;
     this.endpoint    = endpoint;
     this._outbox     = [];
-    this._proxy      = assign({}, this._dispatcher.proxy);
+    this._proxy      = Object.assign({}, this._dispatcher.proxy);
 
-    if (!this._proxy.origin)
+    if (!this._proxy.origin) {
       this._proxy.origin = this._findProxy();
+    }
   },
 
   close: function() {},
@@ -2044,11 +1724,12 @@ var Transport = assign(Class({ className: 'Transport',
     this._outbox.push(message);
     this._flushLargeBatch();
 
-    if (message.channel === Channel.HANDSHAKE)
+    if (message.channel === Channel.HANDSHAKE) {
       return this._publish(0.01);
-
-    if (message.channel === Channel.CONNECT)
+    }
+    if (message.channel === Channel.CONNECT) {
       this._connectMessage = message;
+    }
 
     return this._publish(this.MAX_DELAY);
   },
@@ -2075,8 +1756,9 @@ var Transport = assign(Class({ className: 'Transport',
   _flush: function() {
     this.removeTimeout('publish');
 
-    if (this._outbox.length > 1 && this._connectMessage)
+    if (this._outbox.length > 1 && this._connectMessage) {
       this._connectMessage.advice = { timeout: 0 };
+    }
 
     this._resolvePromise(this.request(this._outbox));
 
@@ -2102,8 +1784,9 @@ var Transport = assign(Class({ className: 'Transport',
     this.debug('Client ? received from ? via ?: ?',
                this._dispatcher.clientId, this.endpoint.href, this.connectionType, replies);
 
-    for (var i = 0, n = replies.length; i < n; i++)
-      this._dispatcher.handleResponse(replies[i]);
+    for (let reply of replies) {
+      this._dispatcher.handleResponse(reply);
+    }
   },
 
   _handleError: function(messages, immediate) {
@@ -2112,8 +1795,9 @@ var Transport = assign(Class({ className: 'Transport',
     this.debug('Client ? failed to send to ? via ?: ?',
                this._dispatcher.clientId, this.endpoint.href, this.connectionType, messages);
 
-    for (var i = 0, n = messages.length; i < n; i++)
-      this._dispatcher.handleError(messages[i]);
+    for (let message of messages) {
+      this._dispatcher.handleError(message);
+    }
   },
 
   _getCookies: function() {
@@ -2135,8 +1819,8 @@ var Transport = assign(Class({ className: 'Transport',
     if (!setCookie || !cookies) return;
     setCookie = [].concat(setCookie);
 
-    for (var i = 0, n = setCookie.length; i < n; i++) {
-      cookie = Cookie.parse(setCookie[i]);
+    for (let cookieStr of setCookie) {
+      cookie = Cookie.parse(cookieStr);
       cookies.setCookieSync(cookie, url);
     }
   },
@@ -2155,17 +1839,19 @@ var Transport = assign(Class({ className: 'Transport',
     if (name === 'http_proxy' && env.REQUEST_METHOD) {
       keys = Object.keys(env).filter(function(k) { return /^http_proxy$/i.test(k) });
       if (keys.length === 1) {
-        if (keys[0] === name && env[upcase] === undefined)
+        if (keys[0] === name && env[upcase] === undefined) {
           proxy = env[name];
+        }
       } else if (keys.length > 1) {
         proxy = env[name];
       }
       proxy = proxy || env['CGI_' + upcase];
     } else {
       proxy = env[name] || env[upcase];
-      if (proxy && !env[name])
+      if (proxy && !env[name]) {
         console.warn('The environment variable ' + upcase +
                      ' is discouraged. Use ' + name + '.');
+      }
     }
     return proxy;
   }
@@ -2178,9 +1864,9 @@ var Transport = assign(Class({ className: 'Transport',
       var connType     = pair[0], klass = pair[1],
           connEndpoint = dispatcher.endpointFor(connType);
 
-      if (array.indexOf(disabled, connType) >= 0)
+      if (array.indexOf(disabled, connType) >= 0) {
         return resume();
-
+      }
       if (array.indexOf(allowed, connType) < 0) {
         klass.isUsable(dispatcher, connEndpoint, function() {});
         return resume();
@@ -2208,15 +1894,16 @@ var Transport = assign(Class({ className: 'Transport',
   disable: function(feature) {
     if (feature !== 'autodisconnect') return;
 
-    for (var i = 0; i < this._transports.length; i++)
-      this._transports[i][1]._unloaded = false;
+    for (let transport of this._transports) {
+      transport[1]._unloaded = false;
+    }
   },
 
   _transports: []
 });
 
-assign(Transport.prototype, Logging);
-assign(Transport.prototype, Timeouts);
+Object.assign(Transport.prototype, Logging);
+Object.assign(Transport.prototype, Timeouts);
 
 module.exports = Transport;
 
@@ -2234,18 +1921,15 @@ module.exports = Transport;
 /* WEBPACK VAR INJECTION */(function(global) {
 
 var Class      = __webpack_require__(/*! ../util/class */ "./src/util/class.js"),
-    Promise    = __webpack_require__(/*! ../util/promise */ "./src/util/promise.js"),
     Set        = __webpack_require__(/*! ../util/set */ "./src/util/set.js"),
     URI        = __webpack_require__(/*! ../util/uri */ "./src/util/uri.js"),
     browser    = __webpack_require__(/*! ../util/browser */ "./src/util/browser/event.js"),
-    copyObject = __webpack_require__(/*! ../util/copy_object */ "./src/util/copy_object.js"),
-    assign     = __webpack_require__(/*! ../util/assign */ "./src/util/assign.js"),
     toJSON     = __webpack_require__(/*! ../util/to_json */ "./src/util/to_json.js"),
     ws         = __webpack_require__(/*! ../util/websocket */ "./src/util/websocket/browser_websocket.js"),
     Deferrable = __webpack_require__(/*! ../mixins/deferrable */ "./src/mixins/deferrable.js"),
     Transport  = __webpack_require__(/*! ./transport */ "./src/transport/transport.js");
 
-var WebSocket = assign(Class(Transport, {
+var WebSocket = Object.assign(Class(Transport, {
   UNCONNECTED:  1,
   CONNECTING:   2,
   CONNECTED:    3,
@@ -2260,7 +1944,7 @@ var WebSocket = assign(Class(Transport, {
 
   request: function(messages) {
     this._pending = this._pending || new Set();
-    for (var i = 0, n = messages.length; i < n; i++) this._pending.add(messages[i]);
+    for (let message of messages) this._pending.add(message);
 
     var self = this;
 
@@ -2310,7 +1994,7 @@ var WebSocket = assign(Class(Transport, {
       delete self._socket;
       self._state = self.UNCONNECTED;
 
-      var pending = self._pending ? self._pending.toArray() : [];
+      var pending = self._pending ? [...self._pending] : [];
       delete self._pending;
 
       if (wasConnected || self._everConnected) {
@@ -2329,9 +2013,9 @@ var WebSocket = assign(Class(Transport, {
 
       replies = [].concat(replies);
 
-      for (var i = 0, n = replies.length; i < n; i++) {
-        if (replies[i].successful === undefined) continue;
-        self._pending.remove(replies[i]);
+      for (let reply of replies) {
+        if (reply.successful === undefined) continue;
+        self._pending.remove(reply);
       }
       self._receive(replies);
     };
@@ -2366,13 +2050,16 @@ var WebSocket = assign(Class(Transport, {
   },
 
   create: function(dispatcher, endpoint) {
-    var sockets = dispatcher.transports.websocket = dispatcher.transports.websocket || {};
-    sockets[endpoint.href] = sockets[endpoint.href] || new this(dispatcher, endpoint);
-    return sockets[endpoint.href];
+    var transports = dispatcher.transports,
+        sockets    = transports.websocket = transports.websocket || new Map();
+
+    if (!sockets.has(endpoint.href)) sockets.set(endpoint.href, new this(dispatcher, endpoint));
+
+    return sockets.get(endpoint.href);
   },
 
   getSocketUrl: function(endpoint) {
-    endpoint = copyObject(endpoint);
+    endpoint = URI.clone(endpoint);
     endpoint.protocol = this.PROTOCOLS[endpoint.protocol];
     return URI.stringify(endpoint);
   },
@@ -2382,12 +2069,13 @@ var WebSocket = assign(Class(Transport, {
   }
 });
 
-assign(WebSocket.prototype, Deferrable);
+Object.assign(WebSocket.prototype, Deferrable);
 
 if (browser.Event && global.onbeforeunload !== undefined) {
   browser.Event.on(global, 'beforeunload', function() {
-    if (WebSocket._unloaded === undefined)
+    if (WebSocket._unloaded === undefined) {
       WebSocket._unloaded = true;
+    }
   });
 }
 
@@ -2410,11 +2098,10 @@ module.exports = WebSocket;
 var Class     = __webpack_require__(/*! ../util/class */ "./src/util/class.js"),
     URI       = __webpack_require__(/*! ../util/uri */ "./src/util/uri.js"),
     browser   = __webpack_require__(/*! ../util/browser */ "./src/util/browser/event.js"),
-    assign    = __webpack_require__(/*! ../util/assign */ "./src/util/assign.js"),
     toJSON    = __webpack_require__(/*! ../util/to_json */ "./src/util/to_json.js"),
     Transport = __webpack_require__(/*! ./transport */ "./src/transport/transport.js");
 
-var XHR = assign(Class(Transport, {
+var XHR = Object.assign(Class(Transport, {
   encode: function(messages) {
     return toJSON(messages);
   },
@@ -2439,14 +2126,14 @@ var XHR = assign(Class(Transport, {
     xhr.setRequestHeader('X-Requested-With', 'XMLHttpRequest');
 
     var headers = this._dispatcher.headers;
-    for (var key in headers) {
-      if (!headers.hasOwnProperty(key)) continue;
-      xhr.setRequestHeader(key, headers[key]);
+    for (let [key, value] of Object.entries(headers)) {
+      xhr.setRequestHeader(key, value);
     }
 
     var abort = function() { xhr.abort() };
-    if (global.onbeforeunload !== undefined)
+    if (global.onbeforeunload !== undefined) {
       browser.Event.on(global, 'beforeunload', abort);
+    }
 
     xhr.onreadystatechange = function() {
       if (!xhr || xhr.readyState !== 4) return;
@@ -2456,8 +2143,9 @@ var XHR = assign(Class(Transport, {
           text       = xhr.responseText,
           successful = (status >= 200 && status < 300) || status === 304 || status === 1223;
 
-      if (global.onbeforeunload !== undefined)
+      if (global.onbeforeunload !== undefined) {
         browser.Event.detach(global, 'beforeunload', abort);
+      }
 
       xhr.onreadystatechange = function() {};
       xhr = null;
@@ -2468,10 +2156,11 @@ var XHR = assign(Class(Transport, {
         replies = JSON.parse(text);
       } catch (error) {}
 
-      if (replies)
+      if (replies) {
         self._receive(replies);
-      else
+      } else {
         self._handleError(messages);
+      }
     };
 
     xhr.send(this.encode(messages));
@@ -2505,8 +2194,9 @@ module.exports = XHR;
 module.exports = {
   commonElement: function(lista, listb) {
     for (var i = 0, n = lista.length; i < n; i++) {
-      if (this.indexOf(listb, lista[i]) !== -1)
+      if (this.indexOf(listb, lista[i]) !== -1) {
         return lista[i];
+      }
     }
     return null;
   },
@@ -2529,9 +2219,8 @@ module.exports = {
         result.push(callback.call(context || null, object[i], i));
       }
     } else {
-      for (var key in object) {
-        if (!object.hasOwnProperty(key)) continue;
-        result.push(callback.call(context || null, key, object[key]));
+      for (let [key, value] of Object.entries(object)) {
+        result.push(callback.call(context || null, key, value));
       }
     }
     return result;
@@ -2541,8 +2230,9 @@ module.exports = {
     if (array.filter) return array.filter(callback, context);
     var result = [];
     for (var i = 0, n = array.length; i < n; i++) {
-      if (callback.call(context || null, array[i], i))
+      if (callback.call(context || null, array[i], i)) {
         result.push(array[i]);
+      }
     }
     return result;
   },
@@ -2576,34 +2266,6 @@ module.exports = {
 };
 
 
-/***/ }),
-
-/***/ "./src/util/assign.js":
-/*!****************************!*\
-  !*** ./src/util/assign.js ***!
-  \****************************/
-/*! no static exports found */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-var forEach = Array.prototype.forEach,
-    hasOwn  = Object.prototype.hasOwnProperty;
-
-module.exports = function(target) {
-  forEach.call(arguments, function(source, i) {
-    if (i === 0) return;
-
-    for (var key in source) {
-      if (hasOwn.call(source, key)) target[key] = source[key];
-    }
-  });
-
-  return target;
-};
-
-
 /***/ }),
 
 /***/ "./src/util/browser/event.js":
@@ -2622,10 +2284,11 @@ var Event = {
   on: function(element, eventName, callback, context) {
     var wrapped = function() { callback.call(context) };
 
-    if (element.addEventListener)
+    if (element.addEventListener) {
       element.addEventListener(eventName, wrapped, false);
-    else
+    } else {
       element.attachEvent('on' + eventName, wrapped);
+    }
 
     this._registry.push({
       _element:   element,
@@ -2647,10 +2310,11 @@ var Event = {
           (context    && context    !== register._context))
         continue;
 
-      if (register._element.removeEventListener)
+      if (register._element.removeEventListener) {
         register._element.removeEventListener(register._type, register._handler, false);
-      else
+      } else {
         register._element.detachEvent('on' + register._type, register._handler);
+      }
 
       this._registry.splice(i,1);
       register = null;
@@ -2675,8 +2339,6 @@ module.exports = {
 "use strict";
 
 
-var assign = __webpack_require__(/*! ./assign */ "./src/util/assign.js");
-
 module.exports = function(parent, methods) {
   if (typeof parent !== 'function') {
     methods = parent;
@@ -2692,7 +2354,7 @@ module.exports = function(parent, methods) {
   bridge.prototype = parent.prototype;
 
   klass.prototype = new bridge();
-  assign(klass.prototype, methods);
+  Object.assign(klass.prototype, methods);
 
   return klass;
 };
@@ -2708,7 +2370,7 @@ module.exports = function(parent, methods) {
 /***/ (function(module, exports) {
 
 module.exports = {
-  VERSION:          '1.4.1',
+  VERSION:          '1.4.2',
 
   BAYEUX_VERSION:   '1.0',
   ID_LENGTH:        160,
@@ -2734,37 +2396,6 @@ module.exports = {
 module.exports = {};
 
 
-/***/ }),
-
-/***/ "./src/util/copy_object.js":
-/*!*********************************!*\
-  !*** ./src/util/copy_object.js ***!
-  \*********************************/
-/*! no static exports found */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-var copyObject = function(object) {
-  var clone, i, key;
-  if (object instanceof Array) {
-    clone = [];
-    i = object.length;
-    while (i--) clone[i] = copyObject(object[i]);
-    return clone;
-  } else if (typeof object === 'object') {
-    clone = (object === null) ? null : {};
-    for (key in object) clone[key] = copyObject(object[key]);
-    return clone;
-  } else {
-    return object;
-  }
-};
-
-module.exports = copyObject;
-
-
 /***/ }),
 
 /***/ "./src/util/event_emitter.js":
@@ -2947,190 +2578,6 @@ EventEmitter.prototype.listeners = function(type) {
 };
 
 
-/***/ }),
-
-/***/ "./src/util/promise.js":
-/*!*****************************!*\
-  !*** ./src/util/promise.js ***!
-  \*****************************/
-/*! no static exports found */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-var asap = __webpack_require__(/*! asap */ "./node_modules/asap/browser-asap.js");
-
-var PENDING   = -1,
-    FULFILLED =  0,
-    REJECTED  =  1;
-
-var Promise = function(task) {
-  this._state = PENDING;
-  this._value = null;
-  this._defer = [];
-
-  execute(this, task);
-};
-
-Promise.prototype.then = function(onFulfilled, onRejected) {
-  var promise = new Promise();
-
-  var deferred = {
-    promise:     promise,
-    onFulfilled: onFulfilled,
-    onRejected:  onRejected
-  };
-
-  if (this._state === PENDING)
-    this._defer.push(deferred);
-  else
-    propagate(this, deferred);
-
-  return promise;
-};
-
-Promise.prototype['catch'] = function(onRejected) {
-  return this.then(null, onRejected);
-};
-
-var execute = function(promise, task) {
-  if (typeof task !== 'function') return;
-
-  var calls = 0;
-
-  var resolvePromise = function(value) {
-    if (calls++ === 0) resolve(promise, value);
-  };
-
-  var rejectPromise = function(reason) {
-    if (calls++ === 0) reject(promise, reason);
-  };
-
-  try {
-    task(resolvePromise, rejectPromise);
-  } catch (error) {
-    rejectPromise(error);
-  }
-};
-
-var propagate = function(promise, deferred) {
-  var state   = promise._state,
-      value   = promise._value,
-      next    = deferred.promise,
-      handler = [deferred.onFulfilled, deferred.onRejected][state],
-      pass    = [resolve, reject][state];
-
-  if (typeof handler !== 'function')
-    return pass(next, value);
-
-  asap(function() {
-    try {
-      resolve(next, handler(value));
-    } catch (error) {
-      reject(next, error);
-    }
-  });
-};
-
-var resolve = function(promise, value) {
-  if (promise === value)
-    return reject(promise, new TypeError('Recursive promise chain detected'));
-
-  var then;
-
-  try {
-    then = getThen(value);
-  } catch (error) {
-    return reject(promise, error);
-  }
-
-  if (!then) return fulfill(promise, value);
-
-  execute(promise, function(resolvePromise, rejectPromise) {
-    then.call(value, resolvePromise, rejectPromise);
-  });
-};
-
-var getThen = function(value) {
-  var type = typeof value,
-      then = (type === 'object' || type === 'function') && value && value.then;
-
-  return (typeof then === 'function')
-         ? then
-         : null;
-};
-
-var fulfill = function(promise, value) {
-  settle(promise, FULFILLED, value);
-};
-
-var reject = function(promise, reason) {
-  settle(promise, REJECTED, reason);
-};
-
-var settle = function(promise, state, value) {
-  var defer = promise._defer, i = 0;
-
-  promise._state = state;
-  promise._value = value;
-  promise._defer = null;
-
-  if (defer.length === 0) return;
-  while (i < defer.length) propagate(promise, defer[i++]);
-};
-
-Promise.resolve = function(value) {
-  try {
-    if (getThen(value)) return value;
-  } catch (error) {
-    return Promise.reject(error);
-  }
-
-  return new Promise(function(resolve, reject) { resolve(value) });
-};
-
-Promise.reject = function(reason) {
-  return new Promise(function(resolve, reject) { reject(reason) });
-};
-
-Promise.all = function(promises) {
-  return new Promise(function(resolve, reject) {
-    var list = [], n = promises.length, i;
-
-    if (n === 0) return resolve(list);
-
-    var push = function(promise, i) {
-      Promise.resolve(promise).then(function(value) {
-        list[i] = value;
-        if (--n === 0) resolve(list);
-      }, reject);
-    };
-
-    for (i = 0; i < n; i++) push(promises[i], i);
-  });
-};
-
-Promise.race = function(promises) {
-  return new Promise(function(resolve, reject) {
-    for (var i = 0, n = promises.length; i < n; i++)
-      Promise.resolve(promises[i]).then(resolve, reject);
-  });
-};
-
-Promise.deferred = function() {
-  var tuple = {};
-
-  tuple.promise = new Promise(function(resolve, reject) {
-    tuple.resolve = resolve;
-    tuple.reject  = reject;
-  });
-  return tuple;
-};
-
-module.exports = Promise;
-
-
 /***/ }),
 
 /***/ "./src/util/set.js":
@@ -3147,48 +2594,36 @@ var Class = __webpack_require__(/*! ./class */ "./src/util/class.js");
 
 module.exports = Class({
   initialize: function() {
-    this._index = {};
+    this._index = new Map();
   },
 
   add: function(item) {
     var key = (item.id !== undefined) ? item.id : item;
-    if (this._index.hasOwnProperty(key)) return false;
-    this._index[key] = item;
+    if (this._index.has(key)) return false;
+    this._index.set(key, item);
     return true;
   },
 
-  forEach: function(block, context) {
-    for (var key in this._index) {
-      if (this._index.hasOwnProperty(key))
-        block.call(context, this._index[key]);
-    }
+  [Symbol.iterator]: function() {
+    return this._index.values();
   },
 
   isEmpty: function() {
-    for (var key in this._index) {
-      if (this._index.hasOwnProperty(key)) return false;
-    }
-    return true;
+    return this._index.size === 0;
   },
 
   member: function(item) {
-    for (var key in this._index) {
-      if (this._index[key] === item) return true;
+    for (let value of this._index.values()) {
+      if (value === item) return true;
     }
     return false;
   },
 
   remove: function(item) {
     var key = (item.id !== undefined) ? item.id : item;
-    var removed = this._index[key];
-    delete this._index[key];
+    var removed = this._index.get(key);
+    this._index.delete(key);
     return removed;
-  },
-
-  toArray: function() {
-    var array = [];
-    this.forEach(function(item) { array.push(item) });
-    return array;
   }
 });
 
@@ -3228,7 +2663,7 @@ module.exports = function(object) {
 
 module.exports = {
   isURI: function(uri) {
-    return uri && uri.protocol && uri.host && uri.path;
+    return uri && uri.protocol && uri.host && uri.pathname;
   },
 
   isSameOrigin: function(uri) {
@@ -3237,81 +2672,22 @@ module.exports = {
            uri.port     === location.port;
   },
 
-  parse: function(url) {
+  parse: function(url, base) {
     if (typeof url !== 'string') return url;
-    var uri = {}, parts, query, pairs, i, n, data;
-
-    var consume = function(name, pattern) {
-      url = url.replace(pattern, function(match) {
-        uri[name] = match;
-        return '';
-      });
-      uri[name] = uri[name] || '';
-    };
 
-    consume('protocol', /^[a-z]+\:/i);
-    consume('host',     /^\/\/[^\/\?#]+/);
-
-    if (!/^\//.test(url) && !uri.host)
-      url = location.pathname.replace(/[^\/]*$/, '') + url;
-
-    consume('pathname', /^[^\?#]*/);
-    consume('search',   /^\?[^#]*/);
-    consume('hash',     /^#.*/);
-
-    uri.protocol = uri.protocol || location.protocol;
-
-    if (uri.host) {
-      uri.host = uri.host.substr(2);
-
-      if (/@/.test(uri.host)) {
-        uri.auth = uri.host.split('@')[0];
-        uri.host = uri.host.split('@')[1];
-      }
-      parts        = uri.host.match(/^\[([^\]]+)\]|^[^:]+/);
-      uri.hostname = parts[1] || parts[0];
-      uri.port     = (uri.host.match(/:(\d+)$/) || [])[1] || '';
+    if (typeof location === 'undefined') {
+      return new URL(url, base);
     } else {
-      uri.host     = location.host;
-      uri.hostname = location.hostname;
-      uri.port     = location.port;
-    }
-
-    uri.pathname = uri.pathname || '/';
-    uri.path = uri.pathname + uri.search;
-
-    query = uri.search.replace(/^\?/, '');
-    pairs = query ? query.split('&') : [];
-    data  = {};
-
-    for (i = 0, n = pairs.length; i < n; i++) {
-      parts = pairs[i].split('=');
-      data[decodeURIComponent(parts[0] || '')] = decodeURIComponent(parts[1] || '');
+      return new URL(url, base || location.href);
     }
-
-    uri.query = data;
-
-    uri.href = this.stringify(uri);
-    return uri;
   },
 
   stringify: function(uri) {
-    var auth   = uri.auth ? uri.auth + '@' : '',
-        string = uri.protocol + '//' + auth + uri.host;
-
-    string += uri.pathname + this.queryString(uri.query) + (uri.hash || '');
-
-    return string;
+    return (typeof uri === 'string') ? uri : uri.href;
   },
 
-  queryString: function(query) {
-    var pairs = [];
-    for (var key in query) {
-      if (!query.hasOwnProperty(key)) continue;
-      pairs.push(encodeURIComponent(key) + '=' + encodeURIComponent(query[key]));
-    }
-    if (pairs.length === 0) return '';
-    return '?' + pairs.join('&');
+  clone: function(url) {
+    return this.parse(url.href);
   }
 };
 
@@ -3331,9 +2707,10 @@ module.exports = {
 var array = __webpack_require__(/*! ./array */ "./src/util/array.js");
 
 module.exports = function(options, validKeys) {
-  for (var key in options) {
-    if (array.indexOf(validKeys, key) < 0)
+  for (let key of Object.keys(options)) {
+    if (array.indexOf(validKeys, key) < 0) {
       throw new Error('Unrecognized option: ' + key);
+    }
   }
 };