Cargo.toml

@@ -11,18 +11,17 @@ categories = ["os", "filesystem", "api-bindings"]
 readme = "README.md"
 
 [workspace]
-members = [".", "vault", "git", "redisclient", "mycelium", "text", "os", "net", "zinit_client", "process", "virt", "postgresclient", "rhai", "herodo", "rfs-client"]
+members = [".", "vault", "git", "redisclient", "mycelium", "text", "os", "net", "zinit_client", "process", "virt", "postgresclient", "rhai", "herodo"]
 resolver = "2"
 
 [workspace.metadata]
 # Workspace-level metadata
-rust-version = "1.85.0"
+rust-version = "1.70.0"
 
 [workspace.dependencies]
 # Core shared dependencies with consistent versions
 anyhow = "1.0.98"
 base64 = "0.22.1"
-bytes = "1.4.0"
 dirs = "6.0.0"
 env_logger = "0.11.8"
 futures = "0.3.30"
@@ -85,4 +84,3 @@ sal-virt = { path = "virt" }
 sal-postgresclient = { path = "postgresclient" }
 sal-vault = { path = "vault" }
 sal-rhai = { path = "rhai" }
-sal-rfs-client = { path = "rfs-client" }

rfs-client/Cargo.toml

@@ -1,21 +1,18 @@
 [package]
-name = "sal-rfs-client"
+name = "rfs-client"
 version = "0.1.0"
 edition = "2021"
-description = "SAL RFS Client - Client library for Remote File System server"
+description = "Client library for RFS (Remote File System) server"
-repository = "https://git.threefold.info/herocode/sal"
+license = "MIT"
-license = "Apache-2.0"
-keywords = ["rfs", "client", "filesystem", "remote"]
-categories = ["filesystem", "api-bindings"]
 
 [dependencies]
 openapi = { path = "./openapi" }
-thiserror.workspace = true
+thiserror = "1.0"
-url.workspace = true
+url = "2.4"
-reqwest = { workspace = true, features = ["json", "multipart"] }
+reqwest = { version = "^0.12", features = ["json", "multipart"] }
-tokio = { workspace = true, features = ["full"] }
+tokio = { version = "1.28", features = ["full"] }
-serde = { workspace = true, features = ["derive"] }
+serde = { version = "1.0", features = ["derive"] }
-serde_json.workspace = true
+serde_json = "1.0"
-log.workspace = true
+log = "0.4"
-bytes.workspace = true
+bytes = "1.4"
-futures.workspace = true
+futures = "0.3"

rfs-client/examples/authentication.rs

@@ -1,5 +1,5 @@
-use sal_rfs_client::RfsClient;
+use rfs_client::RfsClient;
-use sal_rfs_client::types::{ClientConfig, Credentials};
+use rfs_client::types::{ClientConfig, Credentials};
 
 #[tokio::main]
 async fn main() -> Result<(), Box<dyn std::error::Error>> {

rfs-client/examples/block_management.rs

@@ -1,5 +1,5 @@
-use sal_rfs_client::RfsClient;
+use rfs_client::RfsClient;
-use sal_rfs_client::types::{ClientConfig, Credentials};
+use rfs_client::types::{ClientConfig, Credentials};
 use openapi::models::{VerifyBlock, VerifyBlocksRequest};
 
 #[tokio::main]
@@ -109,7 +109,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
     let user_blocks = client.get_user_blocks(Some(1), Some(10)).await?;
     println!("User has {} blocks (showing page 1 with 10 per page)", user_blocks.total);
     for block in user_blocks.blocks.iter().take(3) {
-        println!("  - Block: {}, Size: {}", block.hash, block.size);
+        println!("  - Block: {}, Index: {}", block.hash, block.index);
     }
     
     // Upload a block (upload_block_handler)

rfs-client/examples/file_management.rs

@@ -1,5 +1,5 @@
-use sal_rfs_client::RfsClient;
+use rfs_client::RfsClient;
-use sal_rfs_client::types::{ClientConfig, Credentials, UploadOptions, DownloadOptions};
+use rfs_client::types::{ClientConfig, Credentials, UploadOptions, DownloadOptions};
 
 #[tokio::main]
 async fn main() -> Result<(), Box<dyn std::error::Error>> {

rfs-client/examples/flist_operations.rs

@@ -1,5 +1,6 @@
-use sal_rfs_client::RfsClient;
+use rfs_client::RfsClient;
-use sal_rfs_client::types::{ClientConfig, Credentials, FlistOptions, WaitOptions};
+use rfs_client::types::{ClientConfig, Credentials, FlistOptions, WaitOptions};
+use std::path::Path;
 
 #[tokio::main]
 async fn main() -> Result<(), Box<dyn std::error::Error>> {

rfs-client/examples/wait_for_flist.rs

@@ -1,5 +1,5 @@
-use sal_rfs_client::RfsClient;
+use rfs_client::RfsClient;
-use sal_rfs_client::types::{ClientConfig, Credentials, WaitOptions};
+use rfs_client::types::{ClientConfig, Credentials, WaitOptions};
 use openapi::models::FlistState;
 
 #[tokio::main]

rfs-client/openapi/.openapi-generator/FILES

@@ -54,7 +54,6 @@ docs/TemplateErrBadRequest.md
 docs/TemplateErrInternalServerError.md
 docs/TemplateErrNotFound.md
 docs/UploadBlockParams.md
-docs/UserBlockInfo.md
 docs/UserBlocksResponse.md
 docs/VerifyBlock.md
 docs/VerifyBlocksRequest.md
@@ -118,7 +117,6 @@ src/models/template_err_bad_request.rs
 src/models/template_err_internal_server_error.rs
 src/models/template_err_not_found.rs
 src/models/upload_block_params.rs
-src/models/user_block_info.rs
 src/models/user_blocks_response.rs
 src/models/verify_block.rs
 src/models/verify_blocks_request.rs

rfs-client/openapi/README.md

@@ -95,7 +95,6 @@ Class | Method | HTTP request | Description
  - [TemplateErrInternalServerError](docs/TemplateErrInternalServerError.md)
  - [TemplateErrNotFound](docs/TemplateErrNotFound.md)
  - [UploadBlockParams](docs/UploadBlockParams.md)
- - [UserBlockInfo](docs/UserBlockInfo.md)
  - [UserBlocksResponse](docs/UserBlocksResponse.md)
  - [VerifyBlock](docs/VerifyBlock.md)
  - [VerifyBlocksRequest](docs/VerifyBlocksRequest.md)

rfs-client/openapi/docs/UserBlockInfo.md

@@ -1,12 +0,0 @@
-# UserBlockInfo
-
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**hash** | **String** | Block hash | 
-**size** | **i64** | Block size in bytes | 
-
-[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
-
-

rfs-client/openapi/docs/UserBlocksResponse.md

@@ -5,7 +5,7 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **all_blocks** | **i64** | Total number of all blocks | 
-**blocks** | [**Vec<models::UserBlockInfo>**](UserBlockInfo.md) | List of blocks with their sizes | 
+**blocks** | [**Vec<models::BlockInfo>**](BlockInfo.md) | List of blocks with their indices | 
 **total** | **i64** | Total number of blocks | 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)

rfs-client/openapi/src/models/mod.rs

@@ -92,8 +92,6 @@ pub mod template_err_not_found;
 pub use self::template_err_not_found::TemplateErrNotFound;
 pub mod upload_block_params;
 pub use self::upload_block_params::UploadBlockParams;
-pub mod user_block_info;
-pub use self::user_block_info::UserBlockInfo;
 pub mod user_blocks_response;
 pub use self::user_blocks_response::UserBlocksResponse;
 pub mod verify_block;

rfs-client/openapi/src/models/user_block_info.rs

@@ -1,34 +0,0 @@
-/*
- * rfs
- *
- * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
- *
- * The version of the OpenAPI document: 0.2.0
- * 
- * Generated by: https://openapi-generator.tech
- */
-
-use crate::models;
-use serde::{Deserialize, Serialize};
-
-/// UserBlockInfo : Block information with hash and size
-#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)]
-pub struct UserBlockInfo {
-    /// Block hash
-    #[serde(rename = "hash")]
-    pub hash: String,
-    /// Block size in bytes
-    #[serde(rename = "size")]
-    pub size: i64,
-}
-
-impl UserBlockInfo {
-    /// Block information with hash and size
-    pub fn new(hash: String, size: i64) -> UserBlockInfo {
-        UserBlockInfo {
-            hash,
-            size,
-        }
-    }
-}
-

rfs-client/openapi/src/models/user_blocks_response.rs

@@ -17,9 +17,9 @@ pub struct UserBlocksResponse {
     /// Total number of all blocks
     #[serde(rename = "all_blocks")]
     pub all_blocks: i64,
-    /// List of blocks with their sizes
+    /// List of blocks with their indices
     #[serde(rename = "blocks")]
-    pub blocks: Vec<models::UserBlockInfo>,
+    pub blocks: Vec<models::BlockInfo>,
     /// Total number of blocks
     #[serde(rename = "total")]
     pub total: i64,
@@ -27,7 +27,7 @@ pub struct UserBlocksResponse {
 
 impl UserBlocksResponse {
     /// Response for user blocks endpoint
-    pub fn new(all_blocks: i64, blocks: Vec<models::UserBlockInfo>, total: i64) -> UserBlocksResponse {
+    pub fn new(all_blocks: i64, blocks: Vec<models::BlockInfo>, total: i64) -> UserBlocksResponse {
         UserBlocksResponse {
             all_blocks,
             blocks,

rfs-client/rust-toolchain.toml

@@ -0,0 +1,3 @@
+[toolchain]
+channel = "1.82.0"
+

rfs-client/src/client.rs

@@ -12,8 +12,8 @@ use openapi::{
     },
     models::{
         SignInBody, ListBlocksParams,
-        VerifyBlocksRequest, VerifyBlocksResponse, FlistBody, UserBlocksResponse, BlockDownloadsResponse,
+        VerifyBlocksRequest, VerifyBlocksResponse, VerifyBlock, FlistBody, UserBlocksResponse, BlockDownloadsResponse,
-        BlocksResponse, PreviewResponse, FileInfo, FlistState, FlistStateResponse,
+        BlocksResponse, PreviewResponse, FileInfo, FlistState, ResponseResult, FlistStateResponse, BlockUploadedResponse, FileUploadResponse,
     },
 };
 
@@ -122,7 +122,12 @@ impl RfsClient {
             .map_err(map_openapi_error)?;
         
         // Extract the file hash from the response
-        Ok(result.file_hash.clone())
+        match result {
+            FileUploadResponse { file_hash, .. } => {
+                Ok(file_hash.clone())
+            },
+            _ => Err(RfsError::Other("Unexpected response type from file upload".to_string())),
+        }
     }
 
     /// Download a file from the RFS server

rust-toolchain.toml

@@ -1,3 +0,0 @@
-[toolchain]
-channel = "1.85.0"
-

src/lib.rs

@@ -43,7 +43,6 @@ pub use sal_os as os;
 pub use sal_postgresclient as postgresclient;
 pub use sal_process as process;
 pub use sal_redisclient as redisclient;
-pub use sal_rfs_client as rfs_client;
 pub use sal_rhai as rhai;
 pub use sal_text as text;
 pub use sal_vault as vault;