Remove poll watchers when closing TCP socket

TooTallNate · Mar 4, 2024 · ef38829 · ef38829
1 parent 5852e0c
commit ef38829
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 0 deletions.
diff --git a/.changeset/short-lions-protect.md b/.changeset/short-lions-protect.md
@@ -0,0 +1,5 @@
+---
+"nxjs-runtime": patch
+---
+
+Remove poll watchers when closing TCP socket
diff --git a/source/tcp.c b/source/tcp.c
@@ -184,12 +184,25 @@ JSValue nx_js_tcp_close(JSContext *ctx, JSValueConst this_val, int argc, JSValue
 	{
 		return JS_EXCEPTION;
 	}
+
+	nx_context_t* nx_ctx = JS_GetContextOpaque(ctx);
+	nx_watcher_t *watcher;
+	nx_watcher_t *twatcher;
+	SLIST_FOREACH_SAFE(watcher, &nx_ctx->poll.watchers_head, next, twatcher)
+	{
+		if (watcher->fd == fd) {
+			// TODO: reject promise for this watcher?
+			nx_remove_watcher(&nx_ctx->poll, watcher);
+		}
+	}
+
 	if (close(fd))
 	{
 		// TODO: Throw a regular error
 		JS_ThrowTypeError(ctx, strerror(errno));
 		return JS_EXCEPTION;
 	}
+
 	return JS_UNDEFINED;
 }