feat: make header input more flexible (#42)

Author: Qard

__test__/headers.spec.mjs

@@ -81,3 +81,14 @@ test('includes iterator methods', (t) => {
     ['content-type', 'application/json', headers]
   ])
 })
+
+test('construct from object', (t) => {
+  const headers = new Headers({
+    'Content-Type': 'application/json',
+    'Accept': ['application/json', 'text/html']
+  })
+  t.assert(headers.has('Content-Type'))
+  t.is(headers.get('Content-Type'), 'application/json')
+  t.assert(headers.has('Accept'))
+  t.deepEqual(headers.getAll('Accept'), ['application/json', 'text/html'])
+})

__test__/request.spec.mjs

@@ -22,8 +22,9 @@ test('full construction', (t) => {
     url: 'http://example.com/test.php',
     body: Buffer.from('Hello, from Node.js!'),
     headers: {
-      'Content-Type': ['application/json'],
-      'X-Custom-Header': ['CustomValue']
+      'Content-Type': 'application/json',
+      'Accept': ['application/json', 'text/html'],
+      'X-Custom-Header': 'CustomValue'
     }
   })
 
@@ -32,7 +33,33 @@ test('full construction', (t) => {
   t.assert(req.body instanceof Buffer)
   t.is(req.body.toString('utf8'), 'Hello, from Node.js!')
   t.assert(req.headers instanceof Headers)
-  t.is(req.headers.size, 2)
+  t.is(req.headers.size, 3)
   t.is(req.headers.get('Content-Type'), 'application/json')
+  t.deepEqual(req.headers.getAll('Accept'), ['application/json', 'text/html'])
+  t.is(req.headers.get('X-Custom-Header'), 'CustomValue')
+})
+
+test('construction with headers instance', (t) => {
+  const headers = new Headers({
+    'Content-Type': 'application/json',
+    'Accept': ['application/json', 'text/html'],
+    'X-Custom-Header': 'CustomValue'
+  })
+
+  const req = new Request({
+    method: 'POST',
+    url: 'http://example.com/test.php',
+    body: Buffer.from('Hello, from Node.js!'),
+    headers
+  })
+
+  t.is(req.method, 'POST')
+  t.is(req.url, 'http://example.com/test.php')
+  t.assert(req.body instanceof Buffer)
+  t.is(req.body.toString('utf8'), 'Hello, from Node.js!')
+  t.assert(req.headers instanceof Headers)
+  t.is(req.headers.size, 3)
+  t.is(req.headers.get('Content-Type'), 'application/json')
+  t.deepEqual(req.headers.getAll('Accept'), ['application/json', 'text/html'])
   t.is(req.headers.get('X-Custom-Header'), 'CustomValue')
 })

__test__/response.spec.mjs

@@ -24,8 +24,9 @@ test('Full Response construction', (t) => {
   const res = new Response({
     status: 200,
     headers: {
-      'Content-Type': ['application/json'],
-      'X-Custom-Header': ['CustomValue']
+      'Content-Type': 'application/json',
+      'Accept': ['application/json', 'text/plain'],
+      'X-Custom-Header': 'CustomValue'
     },
     body: Buffer.from(json),
     log: Buffer.from('Hello, from error_log!'),
@@ -35,6 +36,7 @@ test('Full Response construction', (t) => {
   t.is(res.status, 200)
   t.assert(res.headers instanceof Headers)
   t.deepEqual(res.headers.get('Content-Type'), 'application/json')
+  t.deepEqual(res.headers.getAll('Accept'), ['application/json', 'text/plain'])
   t.assert(res.body instanceof Buffer)
   t.deepEqual(res.body.toString(), json)
   t.assert(res.log instanceof Buffer)

crates/lang_handler/Cargo.toml

@@ -10,12 +10,13 @@ path = "src/lib.rs"
 
 [features]
 default = []
-c = []
+napi = ["dep:napi", "dep:napi-build"]
 
 [build-dependencies]
-cbindgen = "0.28.0"
+napi-build = { version = "2.0.1", optional = true }
 
 [dependencies]
 bytes = "1.10.1"
+napi = { version = "2.16.17", optional = true }
 regex = "1.11.1"
 url = "2.5.4"

crates/lang_handler/build.rs

@@ -1,23 +1,7 @@
-extern crate cbindgen;
-
-use std::env;
-use std::path::PathBuf;
+#[cfg(feature = "napi")]
+extern crate napi_build;
 
 fn main() {
-  let crate_dir = env::var("CARGO_MANIFEST_DIR").unwrap();
-
-  let out_dir = PathBuf::from(env::var("OUT_DIR").unwrap())
-    .join("../../..")
-    .canonicalize()
-    .unwrap();
-
-  let header_path = out_dir.join("lang_handler.h");
-
-  cbindgen::Builder::new()
-    .with_crate(crate_dir)
-    .with_include_guard("LANG_HANDLER_H")
-    .with_language(cbindgen::Language::C)
-    .generate()
-    .expect("Unable to generate bindings")
-    .write_to_file(header_path);
+  #[cfg(feature = "napi")]
+  napi_build::setup();
 }