Merge pull request #7 from Daniel-Boll/feature/2-enhance-connect-meth…

…od-to-support-authentication-parameters

Enhance connect method to support authentication parameters

index.d.ts

@@ -3,6 +3,16 @@
 
 /* auto-generated by NAPI-RS */
 
+export const enum Compression {
+  None = 0,
+  Lz4 = 1,
+  Snappy = 2
+}
+export interface ClusterConfig {
+  nodes: Array<string>
+  compression?: Compression
+  defaultExecutionProfile?: ExecutionProfile
+}
 export const enum Consistency {
   Any = 0,
   One = 1,
@@ -20,15 +30,13 @@ export interface ExecutionProfile {
   consistency?: Consistency
   requestTimeout?: number
 }
-export interface ClusterConfig {
-  nodes: Array<string>
-  compression?: Compression
-  defaultExecutionProfile?: ExecutionProfile
+export interface ConnectionOptions {
+  keyspace?: string
+  auth?: Auth
 }
-export const enum Compression {
-  None = 0,
-  Lz4 = 1,
-  Snappy = 2
+export interface Auth {
+  username: string
+  password: string
 }
 export type ScyllaCluster = Cluster
 export class Cluster {
@@ -40,7 +48,7 @@ export class Cluster {
    */
   constructor(clusterConfig: ClusterConfig)
   /** Connect to the cluster */
-  connect(keyspace?: string | undefined | null): Promise<ScyllaSession>
+  connect(keyspaceOrOptions?: string | ConnectionOptions | undefined | null, options?: ConnectionOptions | undefined | null): Promise<ScyllaSession>
 }
 export class ScyllaSession {
   execute(query: string, parameters?: Array<number | string | Uuid> | undefined | null): Promise<any>

index.js

@@ -252,10 +252,10 @@ if (!nativeBinding) {
   throw new Error(`Failed to load native binding`)
 }
 
-const { Consistency, Cluster, Compression, ScyllaSession, Uuid } = nativeBinding
+const { Compression, Consistency, Cluster, ScyllaSession, Uuid } = nativeBinding
 
+module.exports.Compression = Compression
 module.exports.Consistency = Consistency
 module.exports.Cluster = Cluster
-module.exports.Compression = Compression
 module.exports.ScyllaSession = ScyllaSession
 module.exports.Uuid = Uuid

src/cluster/cluster_config/compression.rs

@@ -0,0 +1,18 @@
+use napi::bindgen_prelude::*;
+
+#[napi]
+pub enum Compression {
+  None,
+  Lz4,
+  Snappy,
+}
+
+impl From<Compression> for Option<scylla::transport::Compression> {
+  fn from(value: Compression) -> Self {
+    match value {
+      Compression::None => None,
+      Compression::Lz4 => Some(scylla::transport::Compression::Lz4),
+      Compression::Snappy => Some(scylla::transport::Compression::Snappy),
+    }
+  }
+}

src/cluster/config/cluster_config.rs → src/cluster/cluster_config/mod.rs

@@ -1,4 +1,8 @@
-use crate::cluster::{execution_profile::ExecutionProfile, config::compression::Compression};
+use crate::cluster::{
+  cluster_config::compression::Compression, execution_profile::ExecutionProfile,
+};
+
+pub mod compression;
 
 #[napi(object)]
 pub struct ClusterConfig {

src/cluster/mod.rs

@@ -1,3 +1,3 @@
+pub mod cluster_config;
 pub mod execution_profile;
 pub mod scylla_cluster;
-pub mod config;

src/cluster/scylla_cluster.rs

@@ -1,7 +1,11 @@
-use crate::session::scylla_session::ScyllaSession;
-use crate::cluster::{
-  config::{cluster_config::ClusterConfig, compression::Compression}, 
-  execution_profile::ExecutionProfile
+use napi::Either;
+
+use crate::{
+  cluster::{
+    cluster_config::{compression::Compression, ClusterConfig},
+    execution_profile::ExecutionProfile,
+  },
+  session::scylla_session::ScyllaSession,
 };
 
 #[napi(js_name = "Cluster")]
@@ -11,6 +15,18 @@ struct ScyllaCluster {
   default_execution_profile: Option<ExecutionProfile>,
 }
 
+#[napi(object)]
+struct ConnectionOptions {
+  pub keyspace: Option<String>,
+  pub auth: Option<Auth>,
+}
+
+#[napi(object)]
+struct Auth {
+  pub username: String,
+  pub password: String,
+}
+
 #[napi]
 impl ScyllaCluster {
   /// Object config is in the format:
@@ -36,13 +52,44 @@ impl ScyllaCluster {
 
   /// Connect to the cluster
   #[napi]
-  pub async fn connect(&self, keyspace: Option<String>) -> ScyllaSession {
+  pub async fn connect(
+    &self,
+    keyspace_or_options: Option<Either<String, ConnectionOptions>>,
+    options: Option<ConnectionOptions>,
+  ) -> napi::Result<ScyllaSession> {
     let mut builder = scylla::SessionBuilder::new().known_node(self.uri.as_str());
 
-    if let Some(keyspace) = keyspace {
+    let keyspace = match (&keyspace_or_options, &options) {
+      (Some(Either::A(keyspace)), _) => Ok(Some(keyspace.clone())),
+      (Some(Either::B(_)), Some(_)) => Err(napi::Error::new(
+        napi::Status::InvalidArg,
+        "Options cannot be provided twice",
+      )),
+      (Some(Either::B(options)), _) => Ok(options.keyspace.clone()),
+      (None, Some(options)) => Ok(options.keyspace.clone()),
+      (None, None) => Ok(None),
+    };
+
+    let auth = match (keyspace_or_options, options) {
+      (Some(Either::A(_)), Some(options)) => Ok(options.auth),
+      (Some(Either::B(_)), Some(_)) => Err(napi::Error::new(
+        napi::Status::InvalidArg,
+        "Options cannot be provided twice",
+      )),
+      (Some(Either::B(options)), None) => Ok(options.auth),
+      (None, Some(options)) => Ok(options.auth),
+      (None, None) => Ok(None),
+      (Some(Either::A(_)), None) => Ok(None),
+    };
+
+    if let Some(keyspace) = keyspace? {
       builder = builder.use_keyspace(keyspace, false);
     }
 
+    if let Some(auth) = auth? {
+      builder = builder.user(auth.username, auth.password);
+    }
+
     if let Some(default_execution_profile) = &self.default_execution_profile {
       builder = builder.default_execution_profile_handle(default_execution_profile.into_handle());
     }
@@ -51,6 +98,6 @@ impl ScyllaCluster {
       builder = builder.compression(compression.into());
     }
 
-    ScyllaSession::new(builder.build().await.unwrap())
+    Ok(ScyllaSession::new(builder.build().await.unwrap()))
   }
 }