lib: fix position of new const funcs, jslint

Author: tflanagan

lib/_debugger.js

@@ -785,7 +785,7 @@ function Interface(stdin, stdout, args) {
     } else {
       this.repl.context[key] = fn;
     }
-  }
+  };
 
   // Copy all prototype methods in repl context
   // Setup them as getters if possible
@@ -1259,13 +1259,6 @@ Interface.prototype.watchers = function() {
     return callback();
   }
 
-  this._watchers.forEach((watcher, i) => {
-    this.debugEval(watcher, null, null, function(err, value) {
-      values[i] = err ? '<error>' : value;
-      wait();
-    });
-  });
-
   const wait = () => {
     if (--waiting === 0) {
       if (verbose) this.print('Watchers:');
@@ -1283,6 +1276,13 @@ Interface.prototype.watchers = function() {
       callback(null);
     }
   };
+
+  this._watchers.forEach((watcher, i) => {
+    this.debugEval(watcher, null, null, function(err, value) {
+      values[i] = err ? '<error>' : value;
+      wait();
+    });
+  });
 };
 
 // Break on exception

lib/_http_server.js

@@ -322,135 +322,16 @@ function connectionListener(socket) {
     parser.maxHeaderPairs = 2000;
   }
 
-  socket.addListener('error', socketOnError);
-  socket.addListener('close', serverSocketCloseListener);
-  parser.onIncoming = parserOnIncoming;
-  socket.on('end', socketOnEnd);
-  socket.on('data', socketOnData);
-
-  // We are consuming socket, so it won't get any actual data
-  socket.on('resume', onSocketResume);
-  socket.on('pause', onSocketPause);
-
-  socket.on('drain', socketOnDrain);
-
-  // Override on to unconsume on `data`, `readable` listeners
-  socket.on = socketOnWrap;
-
-  var external = socket._handle._externalStream;
-  if (external) {
-    parser._consumed = true;
-    parser.consume(external);
-  }
-  external = null;
-  parser[kOnExecute] = onParserExecute;
-
   // TODO(isaacs): Move all these functions out of here
   const socketOnError = (e) => {
     // Ignore further errors
-    this.removeListener('error', socketOnError);
-    this.on('error', () => {});
-
-    if (!this.emit('clientError', e, this))
-      this.destroy(e);
-  };
-
-  function socketOnData(d) {
-    assert(!socket._paused);
-    debug('SERVER socketOnData %d', d.length);
-    var ret = parser.execute(d);
-
-    onParserExecuteCommon(ret, d);
-  }
-
-  function onParserExecute(ret, d) {
-    debug('SERVER socketOnParserExecute %d', ret);
-    onParserExecuteCommon(ret, undefined);
-  }
-
-  const onParserExecuteCommon = (ret, d) => {
-    if (ret instanceof Error) {
-      debug('parse error');
-      socketOnError.call(socket, ret);
-    } else if (parser.incoming && parser.incoming.upgrade) {
-      // Upgrade or CONNECT
-      var bytesParsed = ret;
-      var req = parser.incoming;
-      debug('SERVER upgrade or connect', req.method);
-
-      if (!d)
-        d = parser.getCurrentBuffer();
-
-      socket.removeListener('data', socketOnData);
-      socket.removeListener('end', socketOnEnd);
-      socket.removeListener('close', serverSocketCloseListener);
-      unconsume(parser, socket);
-      parser.finish();
-      freeParser(parser, req, null);
-      parser = null;
-
-      var eventName = req.method === 'CONNECT' ? 'connect' : 'upgrade';
-      if (this.listenerCount(eventName) > 0) {
-        debug('SERVER have listener for %s', eventName);
-        var bodyHead = d.slice(bytesParsed, d.length);
+    socket.removeListener('error', socketOnError);
+    socket.on('error', () => {});
 
-        // TODO(isaacs): Need a way to reset a stream to fresh state
-        // IE, not flowing, and not explicitly paused.
-        socket._readableState.flowing = null;
-        this.emit(eventName, req, socket, bodyHead);
-      } else {
-        // Got upgrade header or CONNECT method, but have no handler.
-        socket.destroy();
-      }
-    }
-
-    if (socket._paused && socket.parser) {
-      // onIncoming paused the socket, we should pause the parser as well
-      debug('pause parser');
-      socket.parser.pause();
-    }
+    if (!this.emit('clientError', e, socket))
+      socket.destroy(e);
   };
 
-  const socketOnEnd = () => {
-    var socket = this;
-    var ret = parser.finish();
-
-    if (ret instanceof Error) {
-      debug('parse error');
-      socketOnError.call(socket, ret);
-      return;
-    }
-
-    if (!this.httpAllowHalfOpen) {
-      abortIncoming();
-      if (socket.writable) socket.end();
-    } else if (outgoing.length) {
-      outgoing[outgoing.length - 1]._last = true;
-    } else if (socket._httpMessage) {
-      socket._httpMessage._last = true;
-    } else {
-      if (socket.writable) socket.end();
-    }
-  };
-
-
-  // The following callback is issued after the headers have been read on a
-  // new message. In this callback we setup the response object and pass it
-  // to the user.
-
-  socket._paused = false;
-  function socketOnDrain() {
-    var needPause = outgoingData > socket._writableState.highWaterMark;
-
-    // If we previously paused, then start reading again.
-    if (socket._paused && !needPause) {
-      socket._paused = false;
-      if (socket.parser)
-        socket.parser.resume();
-      socket.resume();
-    }
-  }
-
   const parserOnIncoming = (req, shouldKeepAlive) => {
     incoming.push(req);
 
@@ -486,7 +367,6 @@ function connectionListener(socket) {
 
     // When we're finished writing the response, check if this is the last
     // respose, if so destroy the socket.
-    res.on('finish', resOnFinish);
     const resOnFinish = () => {
       // Usually the first incoming element should be our request.  it may
       // be that in the case abortIncoming() was called that the incoming
@@ -512,7 +392,8 @@ function connectionListener(socket) {
           m.assignSocket(socket);
         }
       }
-    }
+    };
+    res.on('finish', resOnFinish);
 
     if (req.headers.expect !== undefined &&
         (req.httpVersionMajor == 1 && req.httpVersionMinor == 1)) {
@@ -537,6 +418,125 @@ function connectionListener(socket) {
       this.emit('request', req, res);
     }
     return false; // Not a HEAD response. (Not even a response!)
+  };
+
+  const socketOnEnd = () => {
+    var ret = parser.finish();
+
+    if (ret instanceof Error) {
+      debug('parse error');
+      socketOnError(ret);
+      return;
+    }
+
+    if (!this.httpAllowHalfOpen) {
+      abortIncoming();
+      if (socket.writable) socket.end();
+    } else if (outgoing.length) {
+      outgoing[outgoing.length - 1]._last = true;
+    } else if (socket._httpMessage) {
+      socket._httpMessage._last = true;
+    } else {
+      if (socket.writable) socket.end();
+    }
+  };
+
+  const onParserExecuteCommon = (ret, d) => {
+    if (ret instanceof Error) {
+      debug('parse error');
+      socketOnError(ret);
+    } else if (parser.incoming && parser.incoming.upgrade) {
+      // Upgrade or CONNECT
+      var bytesParsed = ret;
+      var req = parser.incoming;
+      debug('SERVER upgrade or connect', req.method);
+
+      if (!d)
+        d = parser.getCurrentBuffer();
+
+      socket.removeListener('data', socketOnData);
+      socket.removeListener('end', socketOnEnd);
+      socket.removeListener('close', serverSocketCloseListener);
+      unconsume(parser, socket);
+      parser.finish();
+      freeParser(parser, req, null);
+      parser = null;
+
+      var eventName = req.method === 'CONNECT' ? 'connect' : 'upgrade';
+      if (this.listenerCount(eventName) > 0) {
+        debug('SERVER have listener for %s', eventName);
+        var bodyHead = d.slice(bytesParsed, d.length);
+
+        // TODO(isaacs): Need a way to reset a stream to fresh state
+        // IE, not flowing, and not explicitly paused.
+        socket._readableState.flowing = null;
+        this.emit(eventName, req, socket, bodyHead);
+      } else {
+        // Got upgrade header or CONNECT method, but have no handler.
+        socket.destroy();
+      }
+    }
+
+    if (socket._paused && socket.parser) {
+      // onIncoming paused the socket, we should pause the parser as well
+      debug('pause parser');
+      socket.parser.pause();
+    }
+  };
+
+  socket.addListener('error', socketOnError);
+  socket.addListener('close', serverSocketCloseListener);
+  parser.onIncoming = parserOnIncoming;
+  socket.on('end', socketOnEnd);
+  socket.on('data', socketOnData);
+
+  // We are consuming socket, so it won't get any actual data
+  socket.on('resume', onSocketResume);
+  socket.on('pause', onSocketPause);
+
+  socket.on('drain', socketOnDrain);
+
+  // Override on to unconsume on `data`, `readable` listeners
+  socket.on = socketOnWrap;
+
+  var external = socket._handle._externalStream;
+  if (external) {
+    parser._consumed = true;
+    parser.consume(external);
+  }
+  external = null;
+  parser[kOnExecute] = onParserExecute;
+
+  // TODO(isaacs): Move all these functions out of here
+
+  function socketOnData(d) {
+    assert(!socket._paused);
+    debug('SERVER socketOnData %d', d.length);
+    var ret = parser.execute(d);
+
+    onParserExecuteCommon(ret, d);
+  }
+
+  function onParserExecute(ret, d) {
+    debug('SERVER socketOnParserExecute %d', ret);
+    onParserExecuteCommon(ret, undefined);
+  }
+
+  // The following callback is issued after the headers have been read on a
+  // new message. In this callback we setup the response object and pass it
+  // to the user.
+
+  socket._paused = false;
+  function socketOnDrain() {
+    var needPause = outgoingData > socket._writableState.highWaterMark;
+
+    // If we previously paused, then start reading again.
+    if (socket._paused && !needPause) {
+      socket._paused = false;
+      if (socket.parser)
+        socket.parser.resume();
+      socket.resume();
+    }
   }
 }
 exports._connectionListener = connectionListener;

lib/_stream_wrap.js

@@ -38,11 +38,11 @@ function StreamWrap(stream) {
     return this.doWrite(req, bufs);
   };
 
-  this.stream.pause();
-  this.stream.on('error', (err) => {
+  const onerror = (err) => {
     this.emit('error', err);
-  });
-  this.stream.on('data', (chunk) => {
+  };
+
+  const ondata = (chunk) => {
     if (!(chunk instanceof Buffer)) {
       // Make sure that no further `data` events will happen
       this.pause();
@@ -54,7 +54,11 @@ function StreamWrap(stream) {
     debug('data', chunk.length);
     if (this._handle)
       this._handle.readBuffer(chunk);
-  });
+  };
+
+  this.stream.pause();
+  this.stream.on('error', onerror);
+  this.stream.on('data', ondata);
   this.stream.once('end', () => {
     debug('end');
     if (this._handle)
@@ -113,12 +117,6 @@ StreamWrap.prototype.doWrite = function doWrite(req, bufs) {
   // Queue the request to be able to cancel it
   const item = this._enqueue('write', req);
 
-  this.stream.cork();
-  bufs.forEach((buf) => {
-    this.stream.write(buf, done);
-  });
-  this.stream.uncork();
-
   const done = (err) => {
     if (!err && --pending !== 0)
       return;
@@ -145,6 +143,12 @@ StreamWrap.prototype.doWrite = function doWrite(req, bufs) {
     });
   };
 
+  this.stream.cork();
+  bufs.forEach((buf) => {
+    this.stream.write(buf, done);
+  });
+  this.stream.uncork();
+
   return 0;
 };
 

lib/_tls_legacy.js

@@ -633,9 +633,6 @@ function onnewsession(key, session) {
 
   var once = false;
 
-  if (!this.server.emit('newSession', key, session, done))
-    done();
-
   const done = () => {
     if (once)
       return;
@@ -644,6 +641,9 @@ function onnewsession(key, session) {
     if (this.ssl)
       this.ssl.newSessionDone();
   };
+
+  if (!this.server.emit('newSession', key, session, done))
+    done();
 }