Snapshots

TaskServer/node_modules/ws/lib/buffer-util.js

@@ -92,7 +92,7 @@ function toBuffer(data) {
   if (data instanceof ArrayBuffer) {
     buf = Buffer.from(data);
   } else if (ArrayBuffer.isView(data)) {
-    buf = viewToBuffer(data);
+    buf = Buffer.from(data.buffer, data.byteOffset, data.byteLength);
   } else {
     buf = Buffer.from(data);
     toBuffer.readOnly = false;
@@ -101,23 +101,6 @@ function toBuffer(data) {
   return buf;
 }
 
-/**
- * Converts an `ArrayBuffer` view into a buffer.
- *
- * @param {(DataView|TypedArray)} view The view to convert
- * @return {Buffer} Converted view
- * @private
- */
-function viewToBuffer(view) {
-  const buf = Buffer.from(view.buffer);
-
-  if (view.byteLength !== view.buffer.byteLength) {
-    return buf.slice(view.byteOffset, view.byteOffset + view.byteLength);
-  }
-
-  return buf;
-}
-
 try {
   const bufferUtil = require('bufferutil');
   const bu = bufferUtil.BufferUtil || bufferUtil;

TaskServer/node_modules/ws/lib/event-target.js

@@ -109,11 +109,16 @@ const EventTarget = {
   /**
    * Register an event listener.
    *
-   * @param {String} method A string representing the event type to listen for
+   * @param {String} type A string representing the event type to listen for
    * @param {Function} listener The listener to add
+   * @param {Object} options An options object specifies characteristics about
+   *     the event listener
+   * @param {Boolean} options.once A `Boolean`` indicating that the listener
+   *     should be invoked at most once after being added. If `true`, the
+   *     listener would be automatically removed when invoked.
    * @public
    */
-  addEventListener(method, listener) {
+  addEventListener(type, listener, options) {
     if (typeof listener !== 'function') return;
 
     function onMessage(data) {
@@ -132,36 +137,38 @@ const EventTarget = {
       listener.call(this, new OpenEvent(this));
     }
 
-    if (method === 'message') {
+    const method = options && options.once ? 'once' : 'on';
+
+    if (type === 'message') {
       onMessage._listener = listener;
-      this.on(method, onMessage);
-    } else if (method === 'close') {
+      this[method](type, onMessage);
+    } else if (type === 'close') {
       onClose._listener = listener;
-      this.on(method, onClose);
-    } else if (method === 'error') {
+      this[method](type, onClose);
+    } else if (type === 'error') {
       onError._listener = listener;
-      this.on(method, onError);
-    } else if (method === 'open') {
+      this[method](type, onError);
+    } else if (type === 'open') {
       onOpen._listener = listener;
-      this.on(method, onOpen);
+      this[method](type, onOpen);
     } else {
-      this.on(method, listener);
+      this[method](type, listener);
     }
   },
 
   /**
    * Remove an event listener.
    *
-   * @param {String} method A string representing the event type to remove
+   * @param {String} type A string representing the event type to remove
    * @param {Function} listener The listener to remove
    * @public
    */
-  removeEventListener(method, listener) {
-    const listeners = this.listeners(method);
+  removeEventListener(type, listener) {
+    const listeners = this.listeners(type);
 
     for (let i = 0; i < listeners.length; i++) {
       if (listeners[i] === listener || listeners[i]._listener === listener) {
-        this.removeListener(method, listeners[i]);
+        this.removeListener(type, listeners[i]);
       }
     }
   }

TaskServer/node_modules/ws/lib/stream.js

@@ -125,8 +125,8 @@ function createWebSocketStream(ws, options) {
     if (ws._socket === null) return;
 
     if (ws._socket._writableState.finished) {
-      if (duplex._readableState.endEmitted) duplex.destroy();
       callback();
+      if (duplex._readableState.endEmitted) duplex.destroy();
     } else {
       ws._socket.once('finish', function finish() {
         // `duplex` is not destroyed here because the `'end'` event will be

TaskServer/node_modules/ws/lib/websocket-server.js

@@ -7,10 +7,9 @@ const { createServer, STATUS_CODES } = require('http');
 const PerMessageDeflate = require('./permessage-deflate');
 const WebSocket = require('./websocket');
 const { format, parse } = require('./extension');
-const { GUID } = require('./constants');
+const { GUID, kWebSocket } = require('./constants');
 
 const keyRegex = /^[+/0-9A-Za-z]{22}==$/;
-const kUsedByWebSocketServer = Symbol('kUsedByWebSocketServer');
 
 /**
  * Class representing a WebSocket server.
@@ -79,13 +78,6 @@ class WebSocketServer extends EventEmitter {
         callback
       );
     } else if (options.server) {
-      if (options.server[kUsedByWebSocketServer]) {
-        throw new Error(
-          'The HTTP/S server is already being used by another WebSocket server'
-        );
-      }
-
-      options.server[kUsedByWebSocketServer] = true;
       this._server = options.server;
     }
 
@@ -153,8 +145,6 @@ class WebSocketServer extends EventEmitter {
         server.close(() => this.emit('close'));
         return;
       }
-
-      delete server[kUsedByWebSocketServer];
     }
 
     process.nextTick(emitClose, this);
@@ -264,6 +254,7 @@ class WebSocketServer extends EventEmitter {
    * @param {net.Socket} socket The network socket between the server and client
    * @param {Buffer} head The first packet of the upgraded stream
    * @param {Function} cb Callback
+   * @throws {Error} If called more than once with the same socket
    * @private
    */
   completeUpgrade(key, extensions, req, socket, head, cb) {
@@ -272,6 +263,13 @@ class WebSocketServer extends EventEmitter {
     //
     if (!socket.readable || !socket.writable) return socket.destroy();
 
+    if (socket[kWebSocket]) {
+      throw new Error(
+        'server.handleUpgrade() was called more than once with the same ' +
+          'socket, possibly due to a misconfiguration'
+      );
+    }
+
     const digest = createHash('sha1')
       .update(key + GUID)
       .digest('base64');
@@ -386,7 +384,7 @@ function abortHandshake(socket, code, message, headers) {
     message = message || STATUS_CODES[code];
     headers = {
       Connection: 'close',
-      'Content-type': 'text/html',
+      'Content-Type': 'text/html',
       'Content-Length': Buffer.byteLength(message),
       ...headers
     };

TaskServer/node_modules/ws/lib/websocket.js

@@ -456,7 +456,6 @@ function initAsClient(websocket, address, protocols, options) {
     protocol: undefined,
     timeout: undefined,
     method: undefined,
-    auth: undefined,
     host: undefined,
     path: undefined,
     port: undefined