deps: Bump reqwest, reqsign and http (#4397)

* deps: Bump reqwest, reqsign and http Signed-off-by: Xuanwo <[email protected]> * Fix cargo lock Signed-off-by: Xuanwo <[email protected]> * Size smaller Signed-off-by: Xuanwo <[email protected]> * Fix nodejs Signed-off-by: Xuanwo <[email protected]> * Fix unit tests Signed-off-by: Xuanwo <[email protected]> --------- Signed-off-by: Xuanwo <[email protected]>
apache · Mar 26, 2024 · 7ccc8a8 · 7ccc8a8
1 parent c997590
commit 7ccc8a8
Show file tree

Hide file tree

Showing 12 changed files with 741 additions and 428 deletions.
diff --git a/.github/services/koofr/koofr/action.yml → ...b/services/koofr/koofr/disable_action.yml b/.github/services/koofr/koofr/action.yml → ...b/services/koofr/koofr/disable_action.yml
diff --git a/bin/oay/Cargo.lock b/bin/oay/Cargo.lock
diff --git a/bin/ofs/Cargo.lock b/bin/ofs/Cargo.lock
diff --git a/bin/oli/Cargo.lock b/bin/oli/Cargo.lock
diff --git a/bindings/nodejs/src/lib.rs b/bindings/nodejs/src/lib.rs
@@ -21,10 +21,12 @@ extern crate napi_derive;
 mod capability;
 
 use std::collections::HashMap;
+use std::fmt::Display;
+use std::io::Read;
 use std::str::FromStr;
 use std::time::Duration;
 
-use futures::TryStreamExt;
+use futures::{AsyncReadExt, TryStreamExt};
 use napi::bindgen_prelude::*;
 
 #[napi]
@@ -181,10 +183,10 @@ impl Operator {
     /// It could be used to read large file in a streaming way.
     #[napi]
     pub async fn reader(&self, path: String) -> Result<Reader> {
+        let meta = self.0.stat(&path).await.map_err(format_napi_error)?;
         let r = self.0.reader(&path).await.map_err(format_napi_error)?;
         Ok(Reader {
-            inner: r,
-            offset: 0,
+            inner: r.into_futures_io_async_read(0..meta.content_length()),
         })
     }
 
@@ -205,10 +207,10 @@ impl Operator {
     /// It could be used to read large file in a streaming way.
     #[napi]
     pub fn reader_sync(&self, path: String) -> Result<BlockingReader> {
+        let meta = self.0.blocking().stat(&path).map_err(format_napi_error)?;
         let r = self.0.blocking().reader(&path).map_err(format_napi_error)?;
         Ok(BlockingReader {
-            inner: r,
-            offset: 0,
+            inner: r.into_std_io_read(0..meta.content_length()),
         })
     }
 
@@ -648,21 +650,15 @@ pub struct ListOptions {
 /// manner.
 #[napi]
 pub struct BlockingReader {
-    inner: opendal::BlockingReader,
-    offset: u64,
+    inner: opendal::StdIoReader,
 }
 
 #[napi]
 impl BlockingReader {
     #[napi]
     pub fn read(&mut self, mut buf: Buffer) -> Result<usize> {
-        let mut buf = buf.as_mut();
-        let size = buf.len();
-        let n = self
-            .inner
-            .read(&mut buf, self.offset, size)
-            .map_err(format_napi_error)?;
-        self.offset += n as u64;
+        let buf = buf.as_mut();
+        let n = self.inner.read(buf).map_err(format_napi_error)?;
         Ok(n)
     }
 }
@@ -671,8 +667,7 @@ impl BlockingReader {
 /// manner.
 #[napi]
 pub struct Reader {
-    inner: opendal::Reader,
-    offset: u64,
+    inner: opendal::FuturesIoAsyncReader,
 }
 
 #[napi]
@@ -685,13 +680,7 @@ impl Reader {
     #[napi]
     pub async unsafe fn read(&mut self, mut buf: Buffer) -> Result<usize> {
         let mut buf = buf.as_mut();
-        let size = buf.len();
-        let n = self
-            .inner
-            .read(&mut buf, self.offset, size)
-            .await
-            .map_err(format_napi_error)?;
-        self.offset += n as u64;
+        let n = self.inner.read(&mut buf).await.map_err(format_napi_error)?;
         Ok(n)
     }
 }
@@ -1008,6 +997,8 @@ impl RetryLayer {
 }
 
 /// Format opendal error to napi error.
-fn format_napi_error(err: opendal::Error) -> Error {
+///
+/// FIXME: handle error correctly.
+fn format_napi_error(err: impl Display) -> Error {
     Error::from_reason(format!("{}", err))
 }