From 9f0aae77b17ff9f8cdeb8ef97927cd2ed8f79437 Mon Sep 17 00:00:00 2001
From: Alex Hultman <alexhultman@gmail.com>
Date: Mon, 21 Jan 2019 09:09:48 +0100
Subject: [PATCH] Fix recursive nextTick calls, drain nextTickQueue before exit

---
 src/addon.cpp | 39 +++++++++++++++++++++++++++++++--------
 src/uws.js    | 16 ++++++++++++++--
 2 files changed, 45 insertions(+), 10 deletions(-)

diff --git a/src/addon.cpp b/src/addon.cpp
index b3b93745..9017bc14 100644
--- a/src/addon.cpp
+++ b/src/addon.cpp
@@ -24,6 +24,12 @@
 using namespace v8;
 
 /* These two are definitely static */
+
+/* Warning: having nextTickQueue items at loop fallthrough is not allowed.
+ * Process will crash/hang due to destruction of V8 resouces after V8 itself
+ * has been destroyed. Either enforce nextTick calls to keep the loop rolling
+ * via for instance setTimeout or setImmediate, or make sure to drain completely
+ * the queue at process.on('beforeExit'). */
 std::vector<UniquePersistent<Function>> nextTickQueue;
 Isolate *isolate;
 
@@ -38,17 +44,32 @@ void nextTick(const FunctionCallbackInfo<Value> &args) {
     nextTickQueue.emplace_back(UniquePersistent<Function>(isolate, Local<Function>::Cast(args[0])));
 }
 
-void emptyNextTickQueue(Isolate *isolate) {
+/* Used for debugging */
+void print(const FunctionCallbackInfo<Value> &args) {
+    NativeString nativeString(isolate, args[0]);
+    std::cout << nativeString.getString() << std::endl;
+}
+
+/* Does not guarantee empty queue because of recursive nextTick calls.
+ * Should return int queueSize after calling queued items, so that
+ * proper while(processNextTickQueueImpl()) can be done */
+int processNextTickQueueImpl(Isolate *isolate) {
     if (nextTickQueue.size()) {
+        /* Swap queues for recursive calls */
+        std::vector<UniquePersistent<Function>> currentNextTickQueue = std::move(nextTickQueue);
+
         HandleScope hs(isolate);
-
-        for (UniquePersistent<Function> &f : nextTickQueue) {
+        for (UniquePersistent<Function> &f : currentNextTickQueue) {
             Local<Function>::New(isolate, f)->Call(isolate->GetCurrentContext()->Global(), 0, nullptr);
-            f.Reset();
         }
-
-        nextTickQueue.clear();
     }
+
+    return nextTickQueue.size();
+}
+
+/* It is possible to call this at process.beforeExit until it returns 0. */
+void processNextTickQueue(const FunctionCallbackInfo<Value> &args) {
+    args.GetReturnValue().Set(Integer::New(isolate, processNextTickQueueImpl(isolate)));
 }
 
 /* todo: Put this function and all inits of it in its own header */
@@ -62,12 +83,12 @@ void Main(Local<Object> exports) {
 
     /* Register our own nextTick handlers */
     uWS::Loop::defaultLoop()->setPostHandler([](uWS::Loop *) {
-        emptyNextTickQueue(isolate);
+        processNextTickQueueImpl(isolate);
     });
 
     /* We also do need it on pre */
     uWS::Loop::defaultLoop()->setPreHandler([](uWS::Loop *) {
-        emptyNextTickQueue(isolate);
+        processNextTickQueueImpl(isolate);
     });
 
     /* Hook up our timers */
@@ -77,6 +98,8 @@ void Main(Local<Object> exports) {
     exports->Set(String::NewFromUtf8(isolate, "App"), FunctionTemplate::New(isolate, uWS_App<uWS::App>)->GetFunction());
     exports->Set(String::NewFromUtf8(isolate, "SSLApp"), FunctionTemplate::New(isolate, uWS_App<uWS::SSLApp>)->GetFunction());
     exports->Set(String::NewFromUtf8(isolate, "nextTick"), FunctionTemplate::New(isolate, nextTick)->GetFunction());
+    exports->Set(String::NewFromUtf8(isolate, "processNextTickQueue"), FunctionTemplate::New(isolate, processNextTickQueue)->GetFunction());
+    exports->Set(String::NewFromUtf8(isolate, "print"), FunctionTemplate::New(isolate, print)->GetFunction());
 
     /* Expose some µSockets functions directly under uWS namespace */
     exports->Set(String::NewFromUtf8(isolate, "us_listen_socket_close"), FunctionTemplate::New(isolate, uWS_us_listen_socket_close)->GetFunction());
diff --git a/src/uws.js b/src/uws.js
index c16c3cde..2f418a76 100644
--- a/src/uws.js
+++ b/src/uws.js
@@ -18,8 +18,20 @@
 module.exports = (() => {
 	try {
 		const uWS = require(`./uws_${process.platform}_${process.versions.modules}.node`);
-		/* We are not compatible with Node.js domain */
-		process.nextTick = (f, ...args) => uWS.nextTick(() => f(...args));
+		/* We are not compatible with Node.js nextTick and/or domains */
+		process.nextTick = (f, ...args) => {
+			uWS.nextTick(() => {
+				f(...args);
+			});
+		};
+		process.on('beforeExit', () => {
+			if (uWS.processNextTickQueue()) {
+				setImmediate(() => {
+
+				});
+			}
+		});
+		/* process.nextTick = setImmediate; */
 		return uWS;
 	} catch (e) {
 		throw new Error('This version of µWS is not compatible with your Node.js build.\n\n' + e.toString());