Add http client apis.

Author: jmjoy

examples/hello/tests/php/test.php

@@ -26,6 +26,6 @@
 
 function assert_eq($left, $right) {
     if ($left !== $right) {
-        throw new Exception(sprintf("left != right,\n left: %s,\n right: %s", var_export($left, true), var_export($right, true)));
+        throw new AssertionError(sprintf("left != right,\n left: %s,\n right: %s", var_export($left, true), var_export($right, true)));
     }
 }

examples/http-client/Cargo.toml

@@ -13,6 +13,7 @@ crate-type = ["cdylib"]
 
 [dependencies]
 anyhow = "1.0.40"
+bytes = "1.0.1"
 phper = { version = "0.2.0-alpha.2", path = "../../phper" }
 reqwest = { version = "0.11.3", features = ["blocking"] }
 thiserror = "1.0.24"

examples/http-client/src/client.rs

@@ -1,30 +1,48 @@
-use crate::errors::HttpClientError;
+use crate::{
+    errors::HttpClientError,
+    response::{ReadiedResponse, RESPONSE_CLASS_NAME},
+};
 use anyhow::Context;
-use phper::{classes::DynamicClass, functions::Argument};
-use reqwest::blocking::{Client, ClientBuilder};
-use std::time::Duration;
+use phper::{classes::DynamicClass, functions::Argument, objects::Object};
+use reqwest::{
+    blocking::{Client, ClientBuilder},
+    Response,
+};
+use std::{mem::MaybeUninit, time::Duration};
 
 const HTTP_CLIENT_CLASS_NAME: &'static str = "HttpClient\\HttpClient";
 
 pub fn make_client_class() -> DynamicClass<Client> {
-    let mut http_client_class = DynamicClass::new_with_constructor(HTTP_CLIENT_CLASS_NAME, || {
+    let mut class = DynamicClass::new_with_constructor(HTTP_CLIENT_CLASS_NAME, || {
         let client = ClientBuilder::new()
             .timeout(Duration::from_secs(15))
             .build()?;
         Ok::<_, HttpClientError>(client)
     });
 
-    http_client_class.add_method(
+    class.add_method(
         "get",
         |this, arguments| {
             let url = arguments[0].as_string()?;
             let client = this.as_state();
-            let response = client.get(url).send().unwrap();
-            let body = response.text().unwrap();
-            Ok::<_, phper::Error>(body)
+            let response = client.get(url).send()?;
+
+            let readied_response = ReadiedResponse {
+                status: response.status(),
+                remote_addr: response.remote_addr(),
+                headers: response.headers().clone(),
+                body: response.bytes()?,
+            };
+
+            let mut response_object =
+                Object::<Option<ReadiedResponse>>::new_by_class_name(RESPONSE_CLASS_NAME)
+                    .map_err(phper::Error::ClassNotFound)?;
+            *response_object.as_mut_state() = Some(readied_response);
+
+            Ok::<_, HttpClientError>(response_object)
         },
         vec![Argument::by_val("url")],
     );
 
-    http_client_class
+    class
 }

examples/http-client/src/errors.rs

@@ -7,6 +7,9 @@ const EXCEPTION_CLASS_NAME: &'static str = "HttpClient\\HttpClientException";
 
 #[derive(thiserror::Error, Debug)]
 pub enum HttpClientError {
+    #[error(transparent)]
+    Phper(#[from] phper::Error),
+
     #[error(transparent)]
     Reqwest(#[from] reqwest::Error),
 }
@@ -18,6 +21,7 @@ impl Throwable for HttpClientError {
 }
 
 pub fn make_exception_class() -> DynamicClass<()> {
-    let exception_class = DynamicClass::new(EXCEPTION_CLASS_NAME);
+    let mut exception_class = DynamicClass::new(EXCEPTION_CLASS_NAME);
+    exception_class.extends("Exception");
     exception_class
 }

examples/http-client/src/lib.rs

@@ -1,10 +1,11 @@
-use crate::client::make_client_class;
+use crate::{
+    client::make_client_class, errors::make_exception_class, response::make_response_class,
+};
 use anyhow::Context;
 use phper::{classes::DynamicClass, modules::Module, php_get_module};
 
 pub mod client;
 pub mod errors;
-pub mod request;
 pub mod response;
 
 #[php_get_module]
@@ -16,6 +17,8 @@ pub fn get_module() -> Module {
     );
 
     module.add_class(make_client_class());
+    module.add_class(make_exception_class());
+    module.add_class(make_response_class());
 
     module
 }

examples/http-client/src/request.rs

@@ -1 +1,44 @@
+use bytes::Bytes;
+use phper::classes::DynamicClass;
+use reqwest::{blocking::Response, header::HeaderMap, StatusCode};
+use std::{
+    convert::Infallible,
+    mem::{zeroed, MaybeUninit},
+    net::SocketAddr,
+};
 
+pub const RESPONSE_CLASS_NAME: &'static str = "HttpClient\\Response";
+
+pub struct ReadiedResponse {
+    pub status: StatusCode,
+    pub remote_addr: Option<SocketAddr>,
+    pub headers: HeaderMap,
+    pub body: Bytes,
+}
+
+pub fn make_response_class() -> DynamicClass<Option<ReadiedResponse>> {
+    let mut class = DynamicClass::new_with_constructor(RESPONSE_CLASS_NAME, || unsafe {
+        Ok::<Option<ReadiedResponse>, Infallible>(None)
+    });
+
+    class.add_method(
+        "body",
+        |this, arguments| {
+            let readied_response = this.as_state().as_ref().unwrap();
+            let body: &[u8] = readied_response.body.as_ref();
+            body.to_vec()
+        },
+        vec![],
+    );
+
+    class.add_method(
+        "status",
+        |this, arguments| {
+            let readied_response = this.as_state().as_ref().unwrap();
+            readied_response.status.as_u16() as i64
+        },
+        vec![],
+    );
+
+    class
+}

examples/http-client/src/response.rs

@@ -1,11 +1,22 @@
 <?php
 
 use HttpClient\HttpClient;
+use HttpClient\HttpClientException;
 
 ini_set("display_errors", "On");
 ini_set("display_startup_errors", "On");
 error_reporting(E_ALL);
 
 $client = new HttpClient();
-$ip = $client->get("http://httpbin.org/ip");
-var_dump($ip);
+
+$resp = $client->get("https://httpbin.org/ip");
+var_dump([
+    "status" => $resp->status(),
+    "body" => $resp->body(),
+]);
+
+try {
+    $client->get("file:///");
+    throw new AssertionError("no throw exception");
+} catch (HttpClientException $e) {
+}

examples/http-client/tests/php/test.php

@@ -89,7 +89,7 @@ pub fn test_php_scripts_with_condition(
         }
 
         println!(
-            "command: {} {}\nstdout: {}\nstderr: {}",
+            "===== command =====\n{} {}\n\n===== stdout =====\n{}\n\n===== stderr =====\n{}\n",
             &context.php_bin,
             args.join(" "),
             stdout,

phper-test/src/lib.rs

@@ -60,6 +60,12 @@ impl<T: Default + Send + Sync + 'static> DynamicClass<T> {
     }
 }
 
+impl<T: Send + Sync + 'static> DynamicClass<Option<T>> {
+    pub fn new_with_none(class_name: impl ToString) -> Self {
+        Self::new_with_constructor(class_name, || Ok::<_, Infallible>(None))
+    }
+}
+
 impl<T: Send + Sync + 'static> DynamicClass<T> {
     pub fn new_with_constructor<F, E>(class_name: impl ToString, state_constructor: F) -> Self
     where
@@ -127,12 +133,16 @@ impl<T: Send + Sync> Classifiable for DynamicClass<T> {
     }
 }
 
+/// Wrapper of [crate::sys::zend_class_entry].
+///
+/// TODO Add generic type.
 #[repr(transparent)]
 pub struct ClassEntry {
     inner: zend_class_entry,
 }
 
 impl ClassEntry {
+    // TODO After added generic type, Check generic type is relate to class_name, otherwise return error.
     pub fn from_globals<'a>(class_name: impl AsRef<str>) -> Result<&'a Self, ClassNotFoundError> {
         let name = class_name.as_ref();
         let ptr: *mut Self = find_global_class_entry_ptr(name).cast();
@@ -153,6 +163,14 @@ impl ClassEntry {
     pub fn as_mut_ptr(&mut self) -> *mut zend_class_entry {
         &mut self.inner
     }
+
+    pub(crate) fn create_object<T>(&self) -> EBox<Object<T>> {
+        unsafe {
+            let f = self.inner.__bindgen_anon_2.create_object.unwrap();
+            let object = f(self.as_ptr() as *mut _);
+            EBox::from_raw(object.cast())
+        }
+    }
 }
 
 fn find_global_class_entry_ptr(name: impl AsRef<str>) -> *mut zend_class_entry {