bare-http1 1.1.2 → 1.1.3

package/CMakeLists.txt

@@ -1,13 +1,13 @@
 cmake_minimum_required(VERSION 3.25)
 
-project(bare_http C)
+project(bare_http1 C)
 
 include(bare)
 
-add_bare_module(bare_http)
+add_bare_module(bare_http1)
 
 target_sources(
-  bare_http
+  bare_http1
   PRIVATE
     binding.c
 )

package/binding.c

@@ -202,27 +202,7 @@ on_new_connection (uv_stream_t *server, int status) {
   err = js_get_reference_value(env, self->on_connection, &on_connection);
   assert(err == 0);
 
-  js_value_t *res;
-
-  err = js_call_function(env, ctx, on_connection, 0, NULL, &res);
-  if (err < 0) return;
-
-  bare_http_connection_t *client;
-  size_t client_size;
-
-  err = js_get_typedarray_info(env, res, NULL, (void **) &client, &client_size, NULL, NULL);
-  assert(err == 0);
-
-  err = uv_tcp_init(loop, (uv_tcp_t *) client);
-  assert(err == 0);
-
-  client->server = self;
-
-  if (uv_accept(server, (uv_stream_t *) client) == 0) {
-    uv_read_start((uv_stream_t *) client, on_alloc_buffer, on_read);
-  } else {
-    uv_close((uv_handle_t *) client, on_connection_close);
-  }
+  js_call_function(env, ctx, on_connection, 0, NULL, NULL);
 }
 
 static js_value_t *
@@ -361,6 +341,41 @@ bare_http_close (js_env_t *env, js_callback_info_t *info) {
   return NULL;
 }
 
+static js_value_t *
+bare_http_accept (js_env_t *env, js_callback_info_t *info) {
+  int err;
+
+  size_t argc = 2;
+  js_value_t *argv[2];
+
+  err = js_get_callback_info(env, info, &argc, argv, NULL, NULL);
+  assert(err == 0);
+
+  bare_http_server_t *server;
+  err = js_get_typedarray_info(env, argv[0], NULL, (void **) &server, NULL, NULL, NULL);
+  assert(err == 0);
+
+  bare_http_connection_t *client;
+  err = js_get_typedarray_info(env, argv[1], NULL, (void **) &client, NULL, NULL, NULL);
+  assert(err == 0);
+
+  uv_loop_t *loop;
+  js_get_env_loop(env, &loop);
+
+  err = uv_tcp_init(loop, (uv_tcp_t *) client);
+  assert(err == 0);
+
+  client->server = server;
+
+  if (uv_accept((uv_stream_t *) server, (uv_stream_t *) client) == 0) {
+    uv_read_start((uv_stream_t *) client, on_alloc_buffer, on_read);
+  } else {
+    uv_close((uv_handle_t *) client, on_connection_close);
+  }
+
+  return NULL;
+}
+
 static js_value_t *
 bare_http_connection_write (js_env_t *env, js_callback_info_t *info) {
   int err;
@@ -495,6 +510,11 @@ init (js_env_t *env, js_value_t *exports) {
     js_create_function(env, "bind", -1, bare_http_bind, NULL, &fn);
     js_set_named_property(env, exports, "bind", fn);
   }
+  {
+    js_value_t *fn;
+    js_create_function(env, "accept", -1, bare_http_accept, NULL, &fn);
+    js_set_named_property(env, exports, "accept", fn);
+  }
   {
     js_value_t *fn;
     js_create_function(env, "close", -1, bare_http_close, NULL, &fn);

package/index.js

@@ -200,9 +200,9 @@ module.exports = class Server extends EventEmitter {
       else if (this.closing && this.connections.length === 0) binding.close(this.handle)
     })
 
-    this.emit('connection', c)
+    binding.accept(this.handle, c.handle)
 
-    return c.handle
+    this.emit('connection', c)
   }
 
   _onread (id, read) {
@@ -300,16 +300,17 @@ class Request extends stream.Readable {
 
 class Response extends stream.Writable {
   constructor (socket, request, close) {
-    super()
+    super({ map: mapToBuffer })
 
     this.statusCode = 200
     this.headers = {}
     this.socket = socket
     this.request = request
-    this.headersFlushed = false
+    this.headersSent = false
     this.chunked = true
     this.close = close
     this.ondrain = null
+    this.finishing = false
     this.onlyHeaders = this.request.method === 'HEAD'
 
     socket.on('drain', () => this._writeContinue())
@@ -317,8 +318,7 @@ class Response extends stream.Writable {
 
   writeHead (statusCode, headers) {
     this.statusCode = statusCode
-    this.headers = headers
-    this.flushHeaders()
+    this.headers = headers || {}
   }
 
   _writeContinue () {
@@ -335,10 +335,15 @@ class Response extends stream.Writable {
   }
 
   _write (data, callback) {
-    if (this.headersFlushed === false) this.flushHeaders()
-    if (this.onlyHeaders === true) return callback(null)
+    if (this.headersSent === false) {
+      if (this.finishing) {
+        const bytes = data.byteLength + this._writableState.buffered
+        this.setHeader('Content-Length', '' + bytes)
+      }
+      this.flushHeaders()
+    }
 
-    if (typeof data === 'string') data = Buffer.from(data)
+    if (this.onlyHeaders === true) return callback(null)
 
     if (this.chunked) {
       data = Buffer.concat([
@@ -357,7 +362,10 @@ class Response extends stream.Writable {
   }
 
   _final (callback) {
-    if (this.headersFlushed === false) this.flushHeaders()
+    if (this.headersSent === false) {
+      this.setHeader('Content-Length', '0')
+      this.flushHeaders()
+    }
 
     if (this.chunked && this.onlyHeaders === false) this.socket.write(Buffer.from('0\r\n\r\n'))
     if (this.close) this.socket.end()
@@ -365,6 +373,11 @@ class Response extends stream.Writable {
     callback(null)
   }
 
+  end (data) {
+    this.finishing = true
+    return super.end(data)
+  }
+
   setHeader (name, value) {
     this.headers[name.toLowerCase()] = value
   }
@@ -374,7 +387,7 @@ class Response extends stream.Writable {
   }
 
   flushHeaders () {
-    if (this.headersFlushed === true) return
+    if (this.headersSent === true) return
 
     let h = 'HTTP/1.1 ' + this.statusCode + ' ' + STATUS_CODES.get(this.statusCode) + '\r\n'
     for (const name of Object.keys(this.headers)) {
@@ -390,7 +403,7 @@ class Response extends stream.Writable {
     h += '\r\n'
 
     this.socket.write(Buffer.from(h))
-    this.headersFlushed = true
+    this.headersSent = true
   }
 }
 
@@ -403,3 +416,7 @@ function httpCase (n) {
 }
 
 function noop () {}
+
+function mapToBuffer (b) {
+  return typeof b === 'string' ? Buffer.from(b) : b
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bare-http1",
-  "version": "1.1.2",
+  "version": "1.1.3",
   "description": "Native HTTP/1 library for JavaScript",
   "main": "index.js",
   "files": [
@@ -11,7 +11,7 @@
     "prebuilds"
   ],
   "scripts": {
-    "test": "standard",
+    "test": "standard && bare test.js",
     "install": "bare-dev rebuild",
     "prebuild": "bare-dev prebuild"
   },
@@ -29,6 +29,8 @@
     "streamx": "^2.13.0"
   },
   "devDependencies": {
+    "bare-subprocess": "^1.0.0",
+    "brittle": "^3.3.0",
     "mime-types": "^2.1.35",
     "pump": "^3.0.0",
     "range-parser": "^1.2.1",