Node.js 11, uWS.nextTick, purely V8

Makefile

@@ -1,6 +1,6 @@
-C_SHARED := -DLIBUS_USE_LIBUV -flto -O3 -c -fPIC -I ../v0.15/uSockets/src ../v0.15/uSockets/src/*.c ../v0.15/uSockets/src/eventing/*.c
+C_SHARED := -DLIBUS_USE_LIBUV -flto -O3 -c -fPIC -I ../uWebSockets/uSockets/src ../uWebSockets/uSockets/src/*.c ../uWebSockets/uSockets/src/eventing/*.c
 
-CPP_SHARED := -DLIBUS_USE_LIBUV -flto -O3 -c -fPIC -std=c++17 -I ../v0.15/uSockets/src -I ../v0.15/src src/addon.cpp
+CPP_SHARED := -DLIBUS_USE_LIBUV -flto -O3 -c -fPIC -std=c++17 -I ../uWebSockets/uSockets/src -I ../uWebSockets/src src/addon.cpp
 
 CPP_OSX := -stdlib=libc++ -mmacosx-version-min=10.7 -undefined dynamic_lookup
 
@@ -9,12 +9,14 @@ default:
 	NODE=targets/node-v8.1.2 ABI=57 make `(uname -s)`
 	NODE=targets/node-v9.2.0 ABI=59 make `(uname -s)`
 	NODE=targets/node-v10.0.0 ABI=64 make `(uname -s)`
+	NODE=targets/node-v11.1.0 ABI=67 make `(uname -s)`
 	for f in dist/*.node; do chmod +x $$f; done
 targets:
 	mkdir targets
 	curl https://nodejs.org/dist/v8.1.2/node-v8.1.2-headers.tar.gz | tar xz -C targets
 	curl https://nodejs.org/dist/v9.2.0/node-v9.2.0-headers.tar.gz | tar xz -C targets
 	curl https://nodejs.org/dist/v10.0.0/node-v10.0.0-headers.tar.gz | tar xz -C targets
+	curl https://nodejs.org/dist/v11.1.0/node-v11.1.0-headers.tar.gz | tar xz -C targets
 Linux:
 	gcc $(C_SHARED)
 	g++ $(CPP_SHARED) -I $$NODE/include/node

dist/uws.js

@@ -1,6 +1,9 @@
 module.exports = (() => {
 	try {
-		return require(`./uws_${process.platform}_${process.versions.modules}.node`);
+		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.apply(...args));
+		return uWS;
 	} catch (e) {
 		throw new Error('This version of µWS is not compatible with your Node.js build.');
 	}

examples/HelloWorld.js

@@ -2,8 +2,10 @@ const uWS = require('../dist/uws.js');
 
 const port = 3000;
 
+const world = new (require('util').TextEncoder)().encode('World!');
+
 uWS.App().get('/hello', (res, req) => {
-  res.end('world!');
+  res.end(world);
 }).get('/*', (res, req) => {
   res.writeHeader('content-type', 'text/html; charset= utf-8').end(req.getHeader('user-agent') + ' är din user agent, biatch!');
 }).listen(port, (token) => {

src/addon.cpp

@@ -1,6 +1,8 @@
+/* We depend only on raw & vanilla libuv, V8 and OpenSSL.
+ * There is to be no dependencies on anything Node.js in here. */
 #include <uv.h>
-#include <node.h>
-#include <node_buffer.h>
+#include <v8.h>
+
 #include <iostream>
 using namespace v8;
 
@@ -18,9 +20,6 @@ public:
             utf8Value = new (utf8ValueMemory) String::Utf8Value(value);
             data = (**utf8Value);
             length = utf8Value->length();
-        } else if (node::Buffer::HasInstance(value)) {
-            data = node::Buffer::Data(value);
-            length = node::Buffer::Length(value);
         } else if (value->IsTypedArray()) {
             Local<ArrayBufferView> arrayBufferView = Local<ArrayBufferView>::Cast(value);
             ArrayBuffer::Contents contents = arrayBufferView->Buffer()->GetContents();
@@ -92,6 +91,8 @@ void uWS_App_get(const FunctionCallbackInfo<Value> &args) {
     Persistent<Function> *pf = new Persistent<Function>();
     pf->Reset(args.GetIsolate(), Local<Function>::Cast(args[1]));
 
+    //Persistent<Function, CopyablePersistentTraits<Function>> p(isolate, Local<Function>::Cast(args[1]));
+
     app->get(std::string(nativeString.getData(), nativeString.getLength()), [pf](auto *res, auto *req) {
         HandleScope hs(isolate);
 
@@ -101,10 +102,8 @@ void uWS_App_get(const FunctionCallbackInfo<Value> &args) {
         Local<Object> reqObject = Local<Object>::New(isolate, reqTemplate)->Clone();
         reqObject->SetAlignedPointerInInternalField(0, req);
 
-		// node:: is horrible but 
         Local<Value> argv[] = {resObject, reqObject};
-		node::MakeCallback(isolate, isolate->GetCurrentContext()->Global(), Local<Function>::New(isolate, *pf), 2, argv);
-
+        Local<Function>::New(isolate, *pf)->Call(isolate->GetCurrentContext()->Global(), 2, argv);
     });
 
     args.GetReturnValue().Set(args.Holder());
@@ -125,6 +124,15 @@ void uWS_App_listen(const FunctionCallbackInfo<Value> &args) {
     args.GetReturnValue().Set(args.Holder());
 }
 
+uv_check_t check;
+#include <vector>
+std::vector<Persistent<Function, CopyablePersistentTraits<Function>>> nextTickQueue;
+
+// we need to override process.nextTick to avoid horrible loss of performance by Node.js
+void nextTick(const FunctionCallbackInfo<Value> &args) {
+    nextTickQueue.push_back(Persistent<Function, CopyablePersistentTraits<Function>>(isolate, Local<Function>::Cast(args[0])));
+}
+
 // uWS.App() -> object
 void uWS_App(const FunctionCallbackInfo<Value> &args) {
     // uWS.App
@@ -149,13 +157,36 @@ void uWS_App(const FunctionCallbackInfo<Value> &args) {
 }
 
 void Main(Local<Object> exports) {
+
     isolate = exports->GetIsolate();
 
+    /* uWS.nextTick is executed in uv_check_t */
+    uv_loop_t *loop = uv_default_loop();
+    uv_check_init(loop, &check);
+    check.data = isolate;
+    uv_check_start(&check, [](uv_check_t *check) {
+
+        if (nextTickQueue.size()) {
+            Isolate *isolate = (Isolate *) check->data;
+            HandleScope hs(isolate);
+
+            for (Persistent<Function, CopyablePersistentTraits<Function>> &f : nextTickQueue) {
+                Local<Function>::New(isolate, f)->Call(isolate->GetCurrentContext()->Global(), 0, nullptr);
+                f.Reset();
+            }
+
+            nextTickQueue.clear();
+        }
+    });
+    uv_unref((uv_handle_t *) &check);
+
     /*reqTemplateLocal->PrototypeTemplate()->SetAccessor(String::NewFromUtf8(isolate, "url"), Request::url);
     reqTemplateLocal->PrototypeTemplate()->SetAccessor(String::NewFromUtf8(isolate, "method"), Request::method);*/
 
-	// App is a function returning an object
-	NODE_SET_METHOD(exports, "App", uWS_App);
+    /* uWS namespace */
+    exports->Set(String::NewFromUtf8(isolate, "App"), FunctionTemplate::New(isolate, uWS_App)->GetFunction());
+    exports->Set(String::NewFromUtf8(isolate, "nextTick"), FunctionTemplate::New(isolate, nextTick)->GetFunction());
+
 
     // HttpResponse template
     Local<FunctionTemplate> resTemplateLocal = FunctionTemplate::New(isolate);
@@ -167,7 +198,7 @@ void Main(Local<Object> exports) {
     Local<Object> resObjectLocal = resTemplateLocal->GetFunction()->NewInstance(isolate->GetCurrentContext()).ToLocalChecked();
     resTemplate.Reset(isolate, resObjectLocal);
 
-	// Request template
+    // Request template (do we need to clone this?)
     Local<FunctionTemplate> reqTemplateLocal = FunctionTemplate::New(isolate);
     reqTemplateLocal->SetClassName(String::NewFromUtf8(isolate, "uWS.HttpRequest"));
     reqTemplateLocal->InstanceTemplate()->SetInternalFieldCount(1);
@@ -177,4 +208,7 @@ void Main(Local<Object> exports) {
     reqTemplate.Reset(isolate, reqObjectLocal);
 }
 
+/* This is the only part where we are allowed/forced to add Node.js specific code.
+ * We do this because we are forced to, and we need a node module version added */
+#include <node.h>
 NODE_MODULE(uWS, Main)