fix(errors): enhance some error handling messages

Signed-off-by: Daniel Boll <danielboll.academico@gmail.com>

Author: Daniel-Boll

index.js

@@ -224,14 +224,72 @@ switch (platform) {
         }
         break
       case 'arm':
+        if (isMusl()) {
+          localFileExisted = existsSync(
+            join(__dirname, 'scylladb.linux-arm-musleabihf.node')
+          )
+          try {
+            if (localFileExisted) {
+              nativeBinding = require('./scylladb.linux-arm-musleabihf.node')
+            } else {
+              nativeBinding = require('@lambda-group/scylladb-linux-arm-musleabihf')
+            }
+          } catch (e) {
+            loadError = e
+          }
+        } else {
+          localFileExisted = existsSync(
+            join(__dirname, 'scylladb.linux-arm-gnueabihf.node')
+          )
+          try {
+            if (localFileExisted) {
+              nativeBinding = require('./scylladb.linux-arm-gnueabihf.node')
+            } else {
+              nativeBinding = require('@lambda-group/scylladb-linux-arm-gnueabihf')
+            }
+          } catch (e) {
+            loadError = e
+          }
+        }
+        break
+      case 'riscv64':
+        if (isMusl()) {
+          localFileExisted = existsSync(
+            join(__dirname, 'scylladb.linux-riscv64-musl.node')
+          )
+          try {
+            if (localFileExisted) {
+              nativeBinding = require('./scylladb.linux-riscv64-musl.node')
+            } else {
+              nativeBinding = require('@lambda-group/scylladb-linux-riscv64-musl')
+            }
+          } catch (e) {
+            loadError = e
+          }
+        } else {
+          localFileExisted = existsSync(
+            join(__dirname, 'scylladb.linux-riscv64-gnu.node')
+          )
+          try {
+            if (localFileExisted) {
+              nativeBinding = require('./scylladb.linux-riscv64-gnu.node')
+            } else {
+              nativeBinding = require('@lambda-group/scylladb-linux-riscv64-gnu')
+            }
+          } catch (e) {
+            loadError = e
+          }
+        }
+        break
+      case 's390x':
         localFileExisted = existsSync(
-          join(__dirname, 'scylladb.linux-arm-gnueabihf.node')
+          join(__dirname, 'scylladb.linux-s390x-gnu.node')
         )
         try {
           if (localFileExisted) {
-            nativeBinding = require('./scylladb.linux-arm-gnueabihf.node')
+            nativeBinding = require('./scylladb.linux-s390x-gnu.node')
           } else {
-            nativeBinding = require('@lambda-group/scylladb-linux-arm-gnueabihf')
+            nativeBinding = require('@lambda-group/scylladb-linux-s390x-gnu')
           }
         } catch (e) {
           loadError = e

src/cluster/scylla_cluster.rs

@@ -111,7 +111,7 @@ impl ScyllaCluster {
       (Some(Either::A(_)), None) => Ok(None),
     };
 
-    if let Some(keyspace) = keyspace? {
+    if let Some(keyspace) = keyspace.clone()? {
       builder = builder.use_keyspace(keyspace, false);
     }
 
@@ -159,6 +159,18 @@ impl ScyllaCluster {
       builder = builder.compression(compression.into());
     }
 
-    Ok(ScyllaSession::new(builder.build().await.unwrap()))
+    let session = builder.build().await;
+
+    match session {
+      Ok(session) => Ok(ScyllaSession::new(session)),
+      Err(err) => Err(napi::Error::from_reason(format!(
+        "Failed to connect to the database: {} - [{uri}] - Keyspace: {keyspace}",
+        err,
+        uri = self.uri,
+        keyspace = keyspace
+          .unwrap_or(Some("No keyspace provided".to_string()))
+          .unwrap_or("No keyspace provided".to_string())
+      ))),
+    }
   }
 }

src/query/scylla_query.rs

@@ -1,3 +1,5 @@
+use std::fmt::Display;
+
 use scylla::query::Query;
 use scylla::statement::Consistency;
 
@@ -6,6 +8,12 @@ pub struct ScyllaQuery {
   pub(crate) query: Query,
 }
 
+impl Display for ScyllaQuery {
+  fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+    write!(f, "ScyllaQuery: {}", self.query.contents)
+  }
+}
+
 #[napi]
 impl ScyllaQuery {
   #[napi(constructor)]

src/session/scylla_session.rs

@@ -29,16 +29,24 @@ impl ScyllaSession {
     query: Either<String, &ScyllaPreparedStatement>,
     parameters: Option<Vec<Either3<u32, String, &Uuid>>>,
   ) -> napi::Result<serde_json::Value> {
-    let values = QueryParameter::parser(parameters).unwrap();
+    let values = QueryParameter::parser(parameters.clone()).ok_or(napi::Error::new(
+      napi::Status::InvalidArg,
+      format!("Something went wrong with your query parameters. {parameters:?}"),
+    ))?;
 
-    let query_result = match query {
+    let query_result = match query.clone() {
       Either::A(query) => self.session.query(query, values).await,
       Either::B(prepared) => self.session.execute(&prepared.prepared, values).await,
     }
     .map_err(|_| {
+      let query = match query {
+        Either::A(query) => query,
+        Either::B(prepared) => prepared.prepared.get_statement().to_string(),
+      };
+
       napi::Error::new(
         napi::Status::InvalidArg,
-        "Something went wrong with your query.",
+        format!("Something went wrong with your query. - [{query}] - {parameters:?}"),
       )
     })?;
 
@@ -51,7 +59,10 @@ impl ScyllaSession {
     scylla_query: &ScyllaQuery,
     parameters: Option<Vec<Either3<u32, String, &Uuid>>>,
   ) -> napi::Result<serde_json::Value> {
-    let values = QueryParameter::parser(parameters).unwrap();
+    let values = QueryParameter::parser(parameters.clone()).ok_or(napi::Error::new(
+      napi::Status::InvalidArg,
+      format!("Something went wrong with your query parameters. {parameters:?}"),
+    ))?;
 
     let query_result = self
       .session
@@ -60,7 +71,7 @@ impl ScyllaSession {
       .map_err(|_| {
         napi::Error::new(
           napi::Status::InvalidArg,
-          "Something went wrong with your query.",
+          format!("Something went wrong with your query. - [{scylla_query}] - {parameters:?}"),
         )
       })?;
 
@@ -69,10 +80,10 @@ impl ScyllaSession {
 
   #[napi]
   pub async fn prepare(&self, query: String) -> napi::Result<ScyllaPreparedStatement> {
-    let prepared = self.session.prepare(query).await.map_err(|_| {
+    let prepared = self.session.prepare(query.clone()).await.map_err(|_| {
       napi::Error::new(
         napi::Status::InvalidArg,
-        "Something went wrong with your prepared statement.",
+        format!("Something went wrong with your prepared statement. - [{query}]"),
       )
     })?;
 

src/types/uuid.rs

@@ -1,6 +1,7 @@
 use napi::Result;
 
 #[napi()]
+#[derive(Debug)]
 pub struct Uuid {
   pub(crate) uuid: uuid::Uuid,
 }