Improve the error handling the Nodejs driver

devraymondsh · Jan 7, 2024 · 77c9039 · 77c9039
1 parent cd53c7c
commit 77c9039
Showing 1 changed file with 48 additions and 46 deletions.
diff --git a/src/drivers/js/nodejs/main.zig b/src/drivers/js/nodejs/main.zig
@@ -118,85 +118,87 @@ pub export fn kivi_deinit_js(env: ntypes.napi_env, info: ntypes.napi_callback_in
 
     return new_undefined(env);
 }
-pub export fn kivi_get_js(env: ntypes.napi_env, info: ntypes.napi_callback_info) ntypes.napi_value {
-    var args_count: usize = 2;
-    var args: [2]ntypes.napi_value = undefined;
-    const argc: usize = get_args(env, info, &args_count, &args);
-    if (argc == 0) return new_undefined(env);
-
-    var self = arg_to_kivi(env, args[0]).?;
 
+fn fetch_single(self: *Kivi, env: ntypes.napi_env, n_keybuf: ntypes.napi_value) ![]u8 {
     var should_be_freed = false;
-    const key = allocate_temp_key(env, args[1], &should_be_freed) catch return new_null(env);
+    const key = try allocate_temp_key(env, n_keybuf, &should_be_freed);
     defer {
         if (should_be_freed) {
             allocator.free(key);
         }
     }
 
-    const value = self.get_slice(key) catch return new_null(env);
-    if (value.len == 0) {
-        return new_null(env);
-    }
-
-    return buffer_to_string(env, value);
+    return self.get_slice(key);
 }
-pub export fn kivi_set_js(env: ntypes.napi_env, info: ntypes.napi_callback_info) ntypes.napi_value {
-    var args_count: usize = 3;
-    var args: [3]ntypes.napi_value = undefined;
+pub export fn kivi_get_js(env: ntypes.napi_env, info: ntypes.napi_callback_info) ntypes.napi_value {
+    var args_count: usize = 2;
+    var args: [2]ntypes.napi_value = undefined;
     const argc: usize = get_args(env, info, &args_count, &args);
     if (argc == 0) return new_undefined(env);
 
-    var self = arg_to_kivi(env, args[0]).?;
+    const self = arg_to_kivi(env, args[0]).?;
+    const value = fetch_single(self, env, args[1]) catch {
+        return new_null(env);
+    };
+
+    return buffer_to_string(env, value);
+}
 
-    const key_len: usize = get_string_length(env, args[1]);
+fn set_single(self: *Kivi, env: ntypes.napi_env, n_keybuf: ntypes.napi_value, n_valbuf: ntypes.napi_value) !usize {
+    const key_len: usize = get_string_length(env, n_keybuf);
     if (key_len == 0) {
-        return new_unint(env, 0);
-    }
-    const key_buf = self.reserve_key(key_len) catch return new_unint(env, 0);
-    const written_key_len = string_to_buffer(env, args[1], key_buf);
-    if (written_key_len == 0) {
-        return new_unint(env, 0);
+        return error.InvalidLength;
     }
 
-    const value_len: usize = get_string_length(env, args[2]);
+    const key_buf = try self.reserve_key(key_len);
+    _ = string_to_buffer(env, n_keybuf, key_buf);
+
+    const value_len: usize = get_string_length(env, n_valbuf);
     if (value_len == 0) {
-        return new_unint(env, 0);
-    }
-    const value_buf = self.reserve_value(value_len) catch {
-        return new_unint(env, 0);
-    };
-    const written_value_len = string_to_buffer(env, args[2], value_buf);
-    if (written_value_len == 0) {
-        return new_unint(env, 0);
+        return error.InvalidLength;
     }
 
-    self.putEntry(key_buf, value_buf) catch {
-        return new_unint(env, 0);
-    };
+    const value_buf = try self.reserve_value(value_len);
+    _ = string_to_buffer(env, n_valbuf, value_buf);
 
-    return new_unint(env, @intCast(value_len));
+    try self.putEntry(key_buf, value_buf);
+
+    return value_len;
 }
-pub export fn kivi_del_js(env: ntypes.napi_env, info: ntypes.napi_callback_info) ntypes.napi_value {
-    var args_count: usize = 2;
-    var args: [2]ntypes.napi_value = undefined;
+pub export fn kivi_set_js(env: ntypes.napi_env, info: ntypes.napi_callback_info) ntypes.napi_value {
+    var args_count: usize = 3;
+    var args: [3]ntypes.napi_value = undefined;
     const argc: usize = get_args(env, info, &args_count, &args);
     if (argc == 0) return new_undefined(env);
 
-    var self = arg_to_kivi(env, args[0]).?;
+    const self = arg_to_kivi(env, args[0]).?;
+    const value_len = set_single(self, env, args[1], args[2]) catch 0;
 
+    return new_unint(env, @intCast(value_len));
+}
+
+fn del_single(self: *Kivi, env: ntypes.napi_env, n_keybuf: ntypes.napi_value) ![]u8 {
     var should_be_freed = false;
-    const key = allocate_temp_key(env, args[1], &should_be_freed) catch return new_null(env);
+    const key = try allocate_temp_key(env, n_keybuf, &should_be_freed);
     defer {
         if (should_be_freed) {
             allocator.free(key);
         }
     }
 
-    const value = self.del_slice(key) catch return new_null(env);
-    if (value.len == 0) {
+    return try self.del_slice(key);
+}
+pub export fn kivi_del_js(env: ntypes.napi_env, info: ntypes.napi_callback_info) ntypes.napi_value {
+    var args_count: usize = 2;
+    var args: [2]ntypes.napi_value = undefined;
+    const argc: usize = get_args(env, info, &args_count, &args);
+    if (argc == 0) return new_undefined(env);
+
+    const self = arg_to_kivi(env, args[0]).?;
+    const value = del_single(self, env, args[1]) catch {
         return new_null(env);
-    }
+    };
+
     const string = buffer_to_string(env, value);
 
     self.del_value(value);