fix(node): remove unwraps

thewh1teagle · May 6, 2024 · 28b1d33 · 28b1d33
1 parent edb949d
commit 28b1d33
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 20 deletions.
diff --git a/bindings/node/package.json b/bindings/node/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rookie-rs/api",
-  "version": "0.0.1-beta.4",
+  "version": "0.0.1-beta.5",
   "main": "index.js",
   "types": "index.d.ts",
   "napi": {

diff --git a/bindings/node/src/lib.rs b/bindings/node/src/lib.rs
@@ -1,7 +1,7 @@
 #[macro_use]
 extern crate napi_derive;
 
-use napi::Result;
+use napi::{Result, Status};
 use rookie::enums::Cookie;
 use std::path::PathBuf;
 
@@ -41,79 +41,91 @@ pub fn any_browser(
   domains: Option<Vec<&str>>,
   key_path: Option<&str>,
 ) -> Result<Vec<CookieObject>> {
-  let cookies = rookie::any_browser(&db_path, domains, key_path).unwrap();
+  let cookies = rookie::any_browser(&db_path, domains, key_path)
+    .map_err(|e| napi::Error::new(Status::Unknown, format!("{e:?}")))?;
   cookies_to_js(cookies)
 }
 
 /// Common browsers
 
 #[napi]
 pub fn firefox(domains: Option<Vec<&str>>) -> Result<Vec<CookieObject>> {
-  let cookies = rookie::firefox(domains).unwrap();
+  let cookies =
+    rookie::firefox(domains).map_err(|e| napi::Error::new(Status::Unknown, format!("{e:?}")))?;
   cookies_to_js(cookies)
 }
 
 #[napi]
 pub fn librewolf(domains: Option<Vec<&str>>) -> Result<Vec<CookieObject>> {
-  let cookies = rookie::librewolf(domains).unwrap();
+  let cookies =
+    rookie::librewolf(domains).map_err(|e| napi::Error::new(Status::Unknown, format!("{e:?}")))?;
   cookies_to_js(cookies)
 }
 
 #[napi]
 pub fn chrome(domains: Option<Vec<&str>>) -> Result<Vec<CookieObject>> {
-  let cookies = rookie::chrome(domains).unwrap();
+  let cookies =
+    rookie::chrome(domains).map_err(|e| napi::Error::new(Status::Unknown, format!("{e:?}")))?;
   cookies_to_js(cookies)
 }
 
 #[napi]
 pub fn brave(domains: Option<Vec<&str>>) -> Result<Vec<CookieObject>> {
-  let cookies = rookie::brave(domains).unwrap();
+  let cookies =
+    rookie::brave(domains).map_err(|e| napi::Error::new(Status::Unknown, format!("{e:?}")))?;
 
   cookies_to_js(cookies)
 }
 
 #[napi]
 pub fn edge(domains: Option<Vec<&str>>) -> Result<Vec<CookieObject>> {
-  let cookies = rookie::edge(domains).unwrap();
+  let cookies =
+    rookie::edge(domains).map_err(|e| napi::Error::new(Status::Unknown, format!("{e:?}")))?;
   cookies_to_js(cookies)
 }
 
 #[napi]
 pub fn opera(domains: Option<Vec<&str>>) -> Result<Vec<CookieObject>> {
-  let cookies = rookie::opera(domains).unwrap();
+  let cookies =
+    rookie::opera(domains).map_err(|e| napi::Error::new(Status::Unknown, format!("{e:?}")))?;
 
   cookies_to_js(cookies)
 }
 
 #[napi]
 pub fn opera_gx(domains: Option<Vec<&str>>) -> Result<Vec<CookieObject>> {
-  let cookies = rookie::opera_gx(domains).unwrap();
+  let cookies =
+    rookie::opera_gx(domains).map_err(|e| napi::Error::new(Status::Unknown, format!("{e:?}")))?;
 
   cookies_to_js(cookies)
 }
 
 #[napi]
 pub fn chromium(domains: Option<Vec<&str>>) -> Result<Vec<CookieObject>> {
-  let cookies = rookie::chromium(domains).unwrap();
+  let cookies =
+    rookie::chromium(domains).map_err(|e| napi::Error::new(Status::Unknown, format!("{e:?}")))?;
   cookies_to_js(cookies)
 }
 
 #[napi]
 pub fn vivaldi(domains: Option<Vec<&str>>) -> Result<Vec<CookieObject>> {
-  let cookies = rookie::vivaldi(domains).unwrap();
+  let cookies =
+    rookie::vivaldi(domains).map_err(|e| napi::Error::new(Status::Unknown, format!("{e:?}")))?;
 
   cookies_to_js(cookies)
 }
 
 #[napi]
 pub fn firefox_based(db_path: String, domains: Option<Vec<&str>>) -> Result<Vec<CookieObject>> {
-  let cookies = rookie::firefox_based(PathBuf::from(db_path), domains).unwrap();
+  let cookies = rookie::firefox_based(PathBuf::from(db_path), domains)
+    .map_err(|e| napi::Error::new(Status::Unknown, format!("{e:?}")))?;
   cookies_to_js(cookies)
 }
 
 #[napi]
 pub fn load(domains: Option<Vec<&str>>) -> Result<Vec<CookieObject>> {
-  let cookies = rookie::load(domains).unwrap();
+  let cookies =
+    rookie::load(domains).map_err(|e| napi::Error::new(Status::Unknown, format!("{e:?}")))?;
   cookies_to_js(cookies)
 }
 
@@ -122,15 +134,17 @@ pub fn load(domains: Option<Vec<&str>>) -> Result<Vec<CookieObject>> {
 #[napi]
 #[cfg(target_os = "windows")]
 pub fn octo_browser(domains: Option<Vec<&str>>) -> Result<Vec<CookieObject>> {
-  let cookies = rookie::octo_browser(domains).unwrap();
+  let cookies = rookie::octo_browser(domains)
+    .map_err(|e| napi::Error::new(Status::Unknown, format!("{e:?}")))?;
 
   cookies_to_js(cookies)
 }
 
 #[napi]
 #[cfg(target_os = "windows")]
 pub fn internet_explorer(domains: Option<Vec<&str>>) -> Result<Vec<CookieObject>> {
-  let cookies = rookie::internet_explorer(domains).unwrap();
+  let cookies = rookie::internet_explorer(domains)
+    .map_err(|e| napi::Error::new(Status::Unknown, format!("{e:?}")))?;
   cookies_to_js(cookies)
 }
 #[napi]
@@ -140,8 +154,8 @@ pub fn chromium_based(
   db_path: String,
   domains: Option<Vec<&str>>,
 ) -> Result<Vec<CookieObject>> {
-  let cookies =
-    rookie::chromium_based(PathBuf::from(key_path), PathBuf::from(db_path), domains).unwrap();
+  let cookies = rookie::chromium_based(PathBuf::from(key_path), PathBuf::from(db_path), domains)
+    .map_err(|e| napi::Error::new(Status::Unknown, format!("{e:?}")))?;
   cookies_to_js(cookies)
 }
 
@@ -150,7 +164,8 @@ pub fn chromium_based(
 #[napi]
 #[cfg(target_os = "macos")]
 pub fn safari(domains: Option<Vec<&str>>) -> Result<Vec<CookieObject>> {
-  let cookies = rookie::safari(domains).unwrap();
+  let cookies =
+    rookie::safari(domains).map_err(|e| napi::Error::new(Status::Unknown, format!("{e:?}")))?;
   cookies_to_js(cookies)
 }
 
@@ -169,6 +184,7 @@ pub fn chromium_based(db_path: String, domains: Option<Vec<&str>>) -> Result<Vec
     osx_key_service: None,
     osx_key_user: None,
   };
-  let cookies = rookie::chromium_based(&config, PathBuf::from(db_path), domains).unwrap();
+  let cookies = rookie::chromium_based(&config, PathBuf::from(db_path), domains)
+    .map_err(|e| napi::Error::new(Status::Unknown, format!("{e:?}")))?;
   cookies_to_js(cookies)
 }