fix: close the socket if connecting failed

oyyd · oyyd · commit f719ca7664b6 · 2023-01-09T13:27:23.000+08:00
diff --git a/README.md b/README.md
@@ -175,6 +175,12 @@ setInterval(() => {
 
 [CONTRIBUTING.md](./CONTRIBUTING.md)
 
+## Development
+
+1. Setup rust and Node.js.
+2. Modify the code.
+2. `npm run build && npm run test`
+
 ## LICENSE
 
 MIT
diff --git a/__test__/seqpacket.spec.ts b/__test__/seqpacket.spec.ts
@@ -361,6 +361,11 @@ if (!kIsDarwin) {
 
       expect(() => client.connect(kServerpath)).toThrow();
 
+      // should close the socket if connecting failed
+      expect(client._state()).toBe(5);
+
+      client.destroy();
+      // it should be okay to destroy multiple times
       client.destroy();
     });
 
diff --git a/js/addon.d.ts b/js/addon.d.ts
@@ -8,6 +8,7 @@ export function socketClose(fd: number): void
 export class SeqpacketSocketWrap {
   constructor(ee: object, fd?: number | undefined | null)
   init(thisObj: object): void
+  state(): number
   close(): void
   shutdownWrite(): void
   uvRefer(): void
diff --git a/js/seqpacket.ts b/js/seqpacket.ts
@@ -290,4 +290,12 @@ export class SeqpacketSocket extends EventEmitter {
     this.destroyed = true;
     this.wrap.close();
   }
+
+  /**
+   * For test only
+   * @ignore
+   */
+  _state() {
+    return this.wrap.state()
+  }
 }
diff --git a/src/seqpacket.rs b/src/seqpacket.rs
@@ -4,8 +4,8 @@ use std::os::raw::c_int;
 
 use crate::socket::{self, get_loop, sockaddr_from_string, Emitter, HandleData, UvRefence};
 use crate::util::{
-  addr_to_string, buf_into_vec, error, get_err, resolve_libc_err, resolve_uv_err,
-  set_clo_exec, set_non_block, socket_addr_to_string, uv_err_msg,
+  addr_to_string, buf_into_vec, error, get_err, resolve_libc_err, resolve_uv_err, set_clo_exec,
+  set_non_block, socket_addr_to_string, uv_err_msg,
 };
 use libc::{sockaddr, sockaddr_un, EAGAIN, EINTR, EINVAL, ENOBUFS, EWOULDBLOCK};
 use napi::{Env, JsBuffer, JsFunction, JsNumber, JsObject, JsString, JsUnknown, Ref, Result};
@@ -120,6 +120,11 @@ impl SeqpacketSocketWrap {
     Ok(())
   }
 
+  #[napi]
+  pub fn state(&self) -> i32 {
+    self.state as i32
+  }
+
   #[napi]
   pub fn close(&mut self) -> Result<()> {
     if self.state == State::Closed {
@@ -534,15 +539,13 @@ impl SeqpacketSocketWrap {
 
     let err = errno();
 
-    if ret == -1 && err != 0 {
-      if err == libc::EINPROGRESS {
-        // not an error
-      } else if err == libc::ECONNRESET || err == EINVAL {
+    // libc::EINPROGRESS is not an error
+    if ret == -1 && err != 0 && err != libc::EINPROGRESS {
+      if err == libc::ECONNRESET || err == EINVAL {
         // TODO should we delay error?
-        resolve_libc_err(ret)?;
-      } else {
-        resolve_libc_err(ret)?;
       }
+      self.close()?;
+      resolve_libc_err(ret)?;
     }
 
     unsafe {
@@ -600,11 +603,13 @@ impl SeqpacketSocketWrap {
 }
 
 extern "C" fn on_close(handle: *mut sys::uv_handle_t) {
-  unsafe { assert!(!(*handle).data.is_null(), "unexpected null handle data"); };
+  unsafe {
+    assert!(!(*handle).data.is_null(), "unexpected null handle data");
+  };
   unsafe {
     let mut data = Box::from_raw((*handle).data as *mut HandleData);
     data.unref().unwrap();
-    Box::from_raw(handle);
+    let _ = Box::from_raw(handle);
   };
 }
 
@@ -615,7 +620,9 @@ macro_rules! on_event {
         return;
       }
 
-      unsafe { assert!(!(*handle).data.is_null(), "unexpected null handle data"); };
+      unsafe {
+        assert!(!(*handle).data.is_null(), "unexpected null handle data");
+      };
       let data = unsafe { Box::from_raw((*handle).data as *mut HandleData) };
       let wrap = data.inner_mut_ref::<&mut SeqpacketSocketWrap>().unwrap();
       wrap.$fn(status, events);

Original file line number	Diff line number	Diff line change
`@@ -290,4 +290,12 @@ export class SeqpacketSocket extends EventEmitter {`
`290`	`290`	`this.destroyed = true;`
`291`	`291`	`this.wrap.close();`
`292`	`292`	`}`
	`293`	`+`
	`294`	`+ /**`
	`295`	`+ * For test only`
	`296`	`+ * @ignore`
	`297`	`+ */`
	`298`	`+ _state() {`
	`299`	`+ return this.wrap.state()`
	`300`	`+ }`
`293`	`301`	`}`