Fix native module loading to support CI artifact structure

The CI downloads artifacts to npm/<platform>/binding.node but the code
was only looking for php.<platform>.node in the root directory. This
change tries the npm directory first (for CI/published builds) and falls
back to the root path (for local development builds).

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <[email protected]>

Author: Qard

Cargo.toml

@@ -12,14 +12,18 @@ napi-support = ["dep:napi", "dep:napi-derive", "dep:napi-build", "http-handler/n
 
 [lib]
 name = "php_node"
-crate-type = ["cdylib"]
+crate-type = ["cdylib", "rlib"]
 path = "src/lib.rs"
 
+[[bin]]
+name = "php-main"
+path = "src/main.rs"
+
 [dependencies]
 async-trait = "0.1.88"
 bytes = "1.10.1"
 hostname = "0.4.1"
-ext-php-rs = { git = "https://github.com/platformatic/ext-php-rs.git" }
+ext-php-rs = { version = "0.14.0", features = ["embed"] }
 http-handler = { git = "https://github.com/platformatic/http-handler.git" }
 # http-handler = { path = "../http-handler" }
 http-rewriter = { git = "https://github.com/platformatic/http-rewriter.git" }

__test__/headers.spec.mjs

@@ -19,20 +19,20 @@ test('only last set is used for get', (t) => {
   const headers = new Headers()
   headers.set('Content-Type', 'application/json')
   headers.add('Content-Type', 'text/html')
-  t.is(headers.size, 2)
+  t.is(headers.size, 1)
   t.assert(headers.has('Content-Type'))
-  t.is(headers.get('Content-Type'), 'application/json')
+  t.is(headers.get('Content-Type'), 'text/html')
 })
 
 test('adding a header with multiple values works and stores to a single entry', (t) => {
   const headers = new Headers()
   headers.add('Accept', 'application/json')
   headers.add('Accept', 'text/html')
-  t.is(headers.size, 2)
+  t.is(headers.size, 1)
   t.assert(headers.has('Accept'))
   t.deepEqual(headers.getAll('Accept'), ['application/json', 'text/html'])
   t.deepEqual(headers.getLine('Accept'), 'application/json,text/html')
-  t.deepEqual(headers.get('Accept'), 'application/json')
+  t.deepEqual(headers.get('Accept'), 'text/html')
 })
 
 test('deleting a header adjusts size and removes value', (t) => {

__test__/request.spec.mjs

@@ -33,7 +33,7 @@ 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, 4)
+  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')
@@ -58,7 +58,7 @@ test('construction with headers instance', (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, 4)
+  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__/rewriter.spec.mjs

@@ -7,7 +7,6 @@ const filename = import.meta.filename.replace(docroot, '')
 
 test('existence condition', (t) => {
   const req = new Request({
-    docroot,
     method: 'GET',
     url: `http://example.com${filename}`,
     headers: {
@@ -29,12 +28,11 @@ test('existence condition', (t) => {
     }
   ])
 
-  t.is(rewriter.rewrite(req).url, 'http://example.com/404')
+  t.is(rewriter.rewrite(req, docroot).url, 'http://example.com/404')
 })
 
 test('non-existence condition', (t) => {
   const req = new Request({
-    docroot,
     method: 'GET',
     url: 'http://example.com/index.php',
     headers: {
@@ -56,7 +54,7 @@ test('non-existence condition', (t) => {
     }
   ])
 
-  t.is(rewriter.rewrite(req).url, 'http://example.com/404')
+  t.is(rewriter.rewrite(req, docroot).url, 'http://example.com/404')
 })
 
 test('condition groups - AND', (t) => {
@@ -199,7 +197,7 @@ test('header rewriting', (t) => {
 test('href rewriting', (t) => {
   const rewriter = new Rewriter([{
     rewriters: [
-      { type: 'href', args: [ '^http://example.com(.*)$', '/index.php?route=${1}' ] }
+      { type: 'href', args: [ '(.*)$', '/index.php?route=${1}' ] }
     ]
   }])
 

index.d.ts

@@ -721,7 +721,7 @@ export declare class ConditionalRewriter {
    * const rewritten = rewriter.rewrite(request);
    * ```
    */
-  rewrite(request: Request): Request
+  rewrite(request: Request, docroot?: string | undefined | null): Request
   /**
    * Chain this rewriter with another, creating a sequence that applies both in order
    *
@@ -887,7 +887,7 @@ export declare class HeaderRewriter {
    * const rewritten = rewriter.rewrite(request);
    * ```
    */
-  rewrite(request: Request): Request
+  rewrite(request: Request, docroot?: string | undefined | null): Request
   /**
    * Chain this rewriter with another, creating a sequence that applies both in order
    *
@@ -931,7 +931,7 @@ export declare class HrefRewriter {
    * const rewritten = rewriter.rewrite(request);
    * ```
    */
-  rewrite(request: Request): Request
+  rewrite(request: Request, docroot?: string | undefined | null): Request
   /**
    * Chain this rewriter with another, creating a sequence that applies both in order
    *
@@ -1019,7 +1019,7 @@ export declare class MethodRewriter {
    * const rewritten = rewriter.rewrite(request);
    * ```
    */
-  rewrite(request: Request): Request
+  rewrite(request: Request, docroot?: string | undefined | null): Request
   /**
    * Chain this rewriter with another, creating a sequence that applies both in order
    *
@@ -1151,7 +1151,7 @@ export declare class PathRewriter {
    * const rewritten = rewriter.rewrite('/path/to/resource');
    * ```
    */
-  rewrite(request: Request): Request
+  rewrite(request: Request, docroot?: string | undefined | null): Request
   /**
    * Chain this rewriter with another, creating a sequence that applies both in order
    *
@@ -1212,9 +1212,11 @@ export declare class Rewriter {
    *
    * ```js
    * const rewritten = rewriter.rewrite(request);
+   * // Or with explicit docroot:
+   * const rewritten = rewriter.rewrite(request, '/var/www/html');
    * ```
    */
-  rewrite(request: Request): Request
+  rewrite(request: Request, docroot?: string | undefined | null): Request
 }
 
 /** A N-API wrapper for the `SequenceRewriter` type. */
@@ -1228,7 +1230,7 @@ export declare class SequenceRewriter {
    * const rewritten = rewriter.rewrite(request);
    * ```
    */
-  rewrite(request: Request): Request
+  rewrite(request: Request, docroot?: string | undefined | null): Request
   /**
    * Chain this rewriter with another, creating a sequence that applies both in order
    *

index.js

@@ -28,10 +28,9 @@ function getNativeBinding({ platform, arch }) {
     name += '-msvc'
   }
 
-  const path = `./php.${name}.node`
-  // const path = process.env.PHP_NODE_TEST
-  //   ? `./php.${name}.node`
-  //   : `./npm/${name}/binding.node`
+  const path = process.env.PHP_NODE_TEST
+    ? `./php.${name}.node`
+    : `./npm/${name}/binding.node`
 
   return require(path)
 }

src/embed.rs

@@ -24,7 +24,35 @@ use super::{
 /// A simple trait for rewriting requests that works with our specific request type
 pub trait RequestRewriter: Send + Sync {
   /// Rewrite the given request and return the modified request
-  fn rewrite_request(&self, request: Request) -> Result<Request, http_rewriter::RewriteError>;
+  ///
+  /// The docroot parameter is used by conditions like ExistenceCondition that need
+  /// to check for files on the filesystem.
+  fn rewrite_request(
+    &self,
+    request: Request,
+    docroot: &Path,
+  ) -> Result<Request, http_rewriter::RewriteError>;
+}
+
+/// Blanket implementation: any type implementing http_rewriter::Rewriter
+/// automatically implements RequestRewriter for our concrete Request type.
+impl<T> RequestRewriter for T
+where
+  T: http_rewriter::Rewriter,
+{
+  fn rewrite_request(
+    &self,
+    request: Request,
+    docroot: &Path,
+  ) -> Result<Request, http_rewriter::RewriteError> {
+    use http_handler::extensions::DocumentRoot;
+    use http_handler::RequestExt;
+    let mut request = request;
+    request.set_document_root(DocumentRoot {
+      path: docroot.to_path_buf(),
+    });
+    http_rewriter::Rewriter::rewrite(self, request)
+  }
 }
 
 /// Embed a PHP script into a Rust application to handle HTTP requests.
@@ -210,7 +238,7 @@ impl Handler for Embed {
     let mut request = request.clone();
     if let Some(rewriter) = &self.rewriter {
       request = rewriter
-        .rewrite_request(request)
+        .rewrite_request(request, &self.docroot)
         .map_err(|e| EmbedRequestError::RequestRewriteError(e.to_string()))?;
     }
 

src/lib.rs

@@ -55,7 +55,6 @@ extern crate napi_derive;
 mod embed;
 mod exception;
 mod request_context;
-mod rewriter_impl;
 mod sapi;
 mod scopes;
 mod strings;
@@ -79,5 +78,4 @@ pub use http_handler::{
 pub use embed::{Embed, RequestRewriter};
 pub use exception::{EmbedRequestError, EmbedStartError};
 pub use request_context::RequestContext;
-pub use rewriter_impl::*;
 pub use test::{MockRoot, MockRootBuilder};

src/main.rs

@@ -0,0 +1,58 @@
+use std::{env::current_dir, fs::File, io::Write, path::PathBuf};
+
+use bytes::BytesMut;
+use php_node::{rewrite::PathRewriter, Embed, Handler, Request, RequestRewriter};
+
+#[tokio::main]
+async fn main() {
+  let _temp_file = TempFile::new("index.php", "<?php echo \"Hello, world!\"; ?>");
+
+  let docroot = current_dir().expect("should have current_dir");
+
+  let rewriter = PathRewriter::new("test", "index").expect("should be valid regex");
+
+  let maybe_rewriter: Option<Box<dyn RequestRewriter>> = Some(Box::new(rewriter));
+  let embed = Embed::new_with_args(docroot, maybe_rewriter, std::env::args())
+    .expect("should construct embed");
+
+  // Build request using the re-exported Request type from http crate
+  let mut request = Request::new(BytesMut::from("Hello, World!"));
+  *request.method_mut() = "POST".parse().unwrap();
+  *request.uri_mut() = "http://example.com/test.php".parse().unwrap();
+  request
+    .headers_mut()
+    .insert("Content-Type", "text/html".parse().unwrap());
+  request
+    .headers_mut()
+    .insert("Content-Length", "13".parse().unwrap());
+
+  println!("request: {:#?}", request);
+
+  let response = embed
+    .handle(request.clone())
+    .await
+    .expect("should handle request");
+
+  println!("response: {:#?}", response);
+}
+
+struct TempFile(PathBuf);
+
+impl TempFile {
+  pub fn new<P, S>(path: P, contents: S) -> Self
+  where
+    P: Into<PathBuf>,
+    S: Into<String>,
+  {
+    let path = path.into();
+    let mut file = File::create(path.clone()).unwrap();
+    file.write_all(contents.into().as_bytes()).unwrap();
+    Self(path)
+  }
+}
+
+impl Drop for TempFile {
+  fn drop(&mut self) {
+    std::fs::remove_file(&self.0).unwrap();
+  }
+}

src/napi.rs

@@ -76,7 +76,8 @@ impl PhpRuntime {
     let rewriter = if let Some(rewriter_ref) = rewriter {
       // Dereference to get the actual NapiRewriter and clone it
       let owned_rewriter = (*rewriter_ref).clone();
-      Some(Box::new(NapiRewriterWrapper(owned_rewriter)) as Box<dyn RequestRewriter>)
+      // Thanks to the blanket impl, NapiRewriter automatically implements RequestRewriter
+      Some(Box::new(owned_rewriter) as Box<dyn RequestRewriter>)
     } else {
       None
     };
@@ -198,16 +199,3 @@ impl Task for PhpRequestTask {
     Ok(Into::<PhpResponse>::into(output))
   }
 }
-
-// Wrapper to adapt NapiRewriter to RequestRewriter
-struct NapiRewriterWrapper(NapiRewriter);
-
-impl RequestRewriter for NapiRewriterWrapper {
-  fn rewrite_request(
-    &self,
-    request: Request,
-  ) -> std::result::Result<Request, http_rewriter::RewriteError> {
-    // Call the Rewriter trait method explicitly
-    <NapiRewriter as http_rewriter::Rewriter>::rewrite(&self.0, request)
-  }
-}