stream_base: last fixes, hopefuly

lib/_tls_wrap.js

@@ -477,6 +477,13 @@ TLSSocket.prototype._finishInit = function() {
 };
 
 TLSSocket.prototype._start = function() {
+  if (this._connecting) {
+    this.once('connect', function() {
+      this._start();
+    });
+    return;
+  }
+
   if (this._tlsOptions.requestOCSP)
     this._handle.requestOCSP();
   this._handle.start();

src/stream_base.h

@@ -19,7 +19,7 @@ class StreamReq {
  public:
   typedef void (*DoneCb)(Req* req, int status);
 
-  StreamReq(DoneCb cb) : cb_(cb) {
+  explicit StreamReq(DoneCb cb) : cb_(cb) {
   }
 
   inline void Done(int status) {
@@ -166,6 +166,7 @@ class StreamBase : public StreamResource {
 
   virtual void* Cast() = 0;
   virtual bool IsAlive() const = 0;
+  virtual bool IsClosing() const = 0;
   virtual bool IsIPCPipe() const = 0;
   virtual int GetFD() const = 0;
 
@@ -187,7 +188,7 @@ class StreamBase : public StreamResource {
               v8::Local<v8::Object> handle);
 
  protected:
-  StreamBase(Environment* env) : env_(env), consumed_(false) {
+  explicit StreamBase(Environment* env) : env_(env), consumed_(false) {
   }
 
   virtual ~StreamBase() = default;

src/stream_wrap.cc

@@ -92,6 +92,11 @@ bool StreamWrap::IsAlive() const {
 }
 
 
+bool StreamWrap::IsClosing() const {
+  return uv_is_closing(reinterpret_cast<uv_handle_t*>(stream()));
+}
+
+
 void* StreamWrap::Cast() {
   return reinterpret_cast<void*>(this);
 }

src/stream_wrap.h

@@ -21,6 +21,7 @@ class StreamWrap : public HandleWrap, public StreamBase {
   int GetFD() const override;
   void* Cast() override;
   bool IsAlive() const override;
+  bool IsClosing() const override;
   bool IsIPCPipe() const override;
 
   // JavaScript functions

src/tls_wrap.cc

@@ -211,8 +211,7 @@ void TLSWrap::Receive(const FunctionCallbackInfo<Value>& args) {
   uv_buf_t buf;
 
   // Copy given buffer entirely or partiall if handle becomes closed
-  // XXX(indunty): figure out uv_is_closing
-  while (len > 0 /* && !uv_is_closing(reinterpret_cast<uv_handle_t*>(stream))*/) {
+  while (len > 0 && !wrap->IsClosing()) {
     wrap->stream_->OnAlloc(len, &buf);
     size_t copy = buf.len > len ? len : buf.len;
     memcpy(buf.base, data, copy);
@@ -507,6 +506,11 @@ bool TLSWrap::IsAlive() const {
 }
 
 
+bool TLSWrap::IsClosing() const {
+  return stream_->IsClosing();
+}
+
+
 int TLSWrap::ReadStart() {
   return stream_->ReadStart();
 }

src/tls_wrap.h

@@ -34,6 +34,7 @@ class TLSWrap : public crypto::SSLWrap<TLSWrap>,
   void* Cast() override;
   int GetFD() const override;
   bool IsAlive() const override;
+  bool IsClosing() const override;
 
   // JavaScript functions
   int ReadStart() override;
@@ -66,7 +67,7 @@ class TLSWrap : public crypto::SSLWrap<TLSWrap>,
   // Write callback queue's item
   class WriteItem {
    public:
-    WriteItem(WriteWrap* w) : w_(w) {
+    explicit WriteItem(WriteWrap* w) : w_(w) {
     }
     ~WriteItem() {
       w_ = nullptr;