src,stream: change return type to Maybe

This changes the return types of some functions to indicate that the functions may have a pending exception, and removes some of todos related. Signed-off-by: Daeyeon Jeong daeyeon.dev@gmail.com
nodejs · Jun 26, 2022 · cc16070 · cc16070
1 parent 3507b3f
commit cc16070
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 12 deletions.
diff --git a/src/stream_base-inl.h b/src/stream_base-inl.h
@@ -278,7 +278,7 @@ void WriteWrap::SetBackingStore(std::unique_ptr<v8::BackingStore> bs) {
   backing_store_ = std::move(bs);
 }
 
-void StreamReq::Done(int status, const char* error_str) {
+v8::Maybe<void> StreamReq::Done(int status, const char* error_str) {
   AsyncWrap* async_wrap = GetAsyncWrap();
   Environment* env = async_wrap->env();
   if (error_str != nullptr) {
@@ -287,11 +287,12 @@ void StreamReq::Done(int status, const char* error_str) {
             env->context(),
             env->error_string(),
             OneByteString(env->isolate(), error_str)).IsNothing()) {
-      return;
+      return v8::Nothing<void>();
     }
   }
 
   OnDone(status);
+  return v8::JustVoid();
 }
 
 void StreamReq::ResetObject(v8::Local<v8::Object> obj) {

diff --git a/src/stream_base.h b/src/stream_base.h
@@ -49,9 +49,7 @@ class StreamReq {
   virtual AsyncWrap* GetAsyncWrap() = 0;
   inline v8::Local<v8::Object> object();
 
-  // TODO(RaisinTen): Update the return type to a Maybe, so that we can indicate
-  // if there is a pending exception/termination.
-  inline void Done(int status, const char* error_str = nullptr);
+  inline v8::Maybe<void> Done(int status, const char* error_str = nullptr);
   inline void Dispose();
 
   StreamBase* stream() const { return stream_; }

diff --git a/src/stream_wrap.cc b/src/stream_wrap.cc
@@ -239,8 +239,7 @@ static MaybeLocal<Object> AcceptHandle(Environment* env,
   return scope.Escape(wrap_obj);
 }
 
-
-void LibuvStreamWrap::OnUvRead(ssize_t nread, const uv_buf_t* buf) {
+v8::Maybe<void> LibuvStreamWrap::OnUvRead(ssize_t nread, const uv_buf_t* buf) {
   HandleScope scope(env()->isolate());
   Context::Scope context_scope(env()->context());
   uv_handle_type type = UV_UNKNOWN_HANDLE;
@@ -272,14 +271,14 @@ void LibuvStreamWrap::OnUvRead(ssize_t nread, const uv_buf_t* buf) {
           object()->Set(env()->context(),
                         env()->pending_handle_string(),
                         local_pending_obj).IsNothing()) {
-      return;
+      return v8::Nothing<void>();
     }
   }
 
   EmitRead(nread, *buf);
+  return v8::JustVoid();
 }
 
-
 void LibuvStreamWrap::GetWriteQueueSize(
     const FunctionCallbackInfo<Value>& info) {
   LibuvStreamWrap* wrap;

diff --git a/src/stream_wrap.h b/src/stream_wrap.h
@@ -105,9 +105,7 @@ class LibuvStreamWrap : public HandleWrap, public StreamBase {
 
   // Callbacks for libuv
   void OnUvAlloc(size_t suggested_size, uv_buf_t* buf);
-  // TODO(RaisinTen): Update the return type to a Maybe, so that we can indicate
-  // if there is a pending exception/termination.
-  void OnUvRead(ssize_t nread, const uv_buf_t* buf);
+  v8::Maybe<void> OnUvRead(ssize_t nread, const uv_buf_t* buf);
 
   static void AfterUvWrite(uv_write_t* req, int status);
   static void AfterUvShutdown(uv_shutdown_t* req, int status);