Defer writing to file cache to separate thread

This allows the plugin to get the data faster while the cache update continues in the background.

src/cache.rs

@@ -1,18 +1,20 @@
-use std::{fs::create_dir_all, fs::File, io::BufReader, io::Write, path::Path, path::PathBuf};
+use std::{
+    fs::create_dir_all, fs::File, io::BufReader, io::Write, path::Path, path::PathBuf, thread,
+};
 
 use anyhow::{Context, Result};
 use base64::{encode_config, URL_SAFE_NO_PAD};
 use bytes::Bytes;
 use chrono::{DateTime, Utc};
-use reqwest::{blocking::Response, header::HeaderMap};
+use reqwest::header::HeaderMap;
 use serde::{Deserialize, Serialize};
 #[cfg(test)]
 use tempfile::tempfile;
 
 #[cfg(not(test))]
-use log::info;
+use log::{error, info};
 #[cfg(test)]
-use std::println as info;
+use std::{println as error, println as info};
 
 use super::API_VERSION;
 
@@ -60,14 +62,23 @@ pub fn update_metadata_file_cache(cache_path: &Path, headers: &HeaderMap) -> Res
 }
 
 pub fn update_file_caches(
-    body_cache_path: &Path,
-    metadata_cache_path: &Path,
-    response: Response,
-) -> Result<Bytes> {
-    update_metadata_file_cache(metadata_cache_path, &response.headers())?;
-    let bytes = response.bytes()?;
-    update_file_cache(body_cache_path, &bytes)?;
-    Ok(bytes)
+    body_cache_path: PathBuf,
+    metadata_cache_path: PathBuf,
+    bytes: Bytes,
+    headers: HeaderMap,
+) {
+    thread::spawn(move || {
+        update_file_cache(&body_cache_path, &bytes)
+            .map_err(|err| {
+                error!("Failed to update body file cache: {}", err);
+            })
+            .ok();
+        update_metadata_file_cache(&metadata_cache_path, &headers)
+            .map_err(|err| {
+                error!("Failed to update metadata file cache: {}", err);
+            })
+            .ok();
+    });
 }
 
 pub fn from_file_cache<T: for<'de> Deserialize<'de>>(cache_path: &Path) -> Result<T> {

src/interior_ref_list.rs

@@ -11,8 +11,7 @@ use std::{println as info, println as error};
 
 use crate::{
     cache::file_cache_dir, cache::from_file_cache, cache::load_metadata_from_file_cache,
-    cache::update_file_cache, cache::update_file_caches, cache::update_metadata_file_cache,
-    log_server_error, result::FFIResult,
+    cache::update_file_caches, log_server_error, result::FFIResult,
 };
 
 #[derive(Serialize, Deserialize, Debug)]
@@ -141,14 +140,10 @@ pub extern "C" fn create_interior_ref_list(
         let bytes = resp.bytes()?;
         let json: InteriorRefList = serde_json::from_slice(&bytes)?;
         if let Some(id) = json.id {
-            update_file_cache(
-                &cache_dir.join(format!("interior_ref_list_{}.json", id)),
-                &bytes,
-            )?;
-            update_metadata_file_cache(
-                &cache_dir.join(format!("interior_ref_list_{}_metadata.json", id)),
-                &headers,
-            )?;
+            let body_cache_path = cache_dir.join(format!("interior_ref_list_{}.json", id));
+            let metadata_cache_path =
+                cache_dir.join(format!("interior_ref_list_{}_metadata.json", id));
+            update_file_caches(body_cache_path, metadata_cache_path, bytes, headers);
         }
         Ok(json)
     }
@@ -223,8 +218,10 @@ pub extern "C" fn update_interior_ref_list(
         let body_cache_path = cache_dir.join(format!("shop_{}_interior_ref_list.json", shop_id));
         let metadata_cache_path =
             cache_dir.join(format!("shop_{}_interior_ref_list_metadata.json", shop_id));
-        let bytes = update_file_caches(&body_cache_path, &metadata_cache_path, resp)?;
+        let headers = resp.headers().clone();
+        let bytes = resp.bytes()?;
         let json: InteriorRefList = serde_json::from_slice(&bytes)?;
+        update_file_caches(body_cache_path, metadata_cache_path, bytes, headers);
         Ok(json)
     }
 
@@ -296,8 +293,10 @@ pub extern "C" fn get_interior_ref_list(
             Ok(resp) => {
                 info!("get_interior_ref_list response from api: {:?}", &resp);
                 if resp.status().is_success() {
-                    let bytes = update_file_caches(&body_cache_path, &metadata_cache_path, resp)?;
+                    let headers = resp.headers().clone();
+                    let bytes = resp.bytes()?;
                     let json = serde_json::from_slice(&bytes)?;
+                    update_file_caches(body_cache_path, metadata_cache_path, bytes, headers);
                     Ok(json)
                 } else if resp.status() == StatusCode::NOT_MODIFIED {
                     from_file_cache(&body_cache_path)
@@ -396,8 +395,10 @@ pub extern "C" fn get_interior_ref_list_by_shop_id(
                     &resp
                 );
                 if resp.status().is_success() {
-                    let bytes = update_file_caches(&body_cache_path, &metadata_cache_path, resp)?;
+                    let headers = resp.headers().clone();
+                    let bytes = resp.bytes()?;
                     let json = serde_json::from_slice(&bytes)?;
+                    update_file_caches(body_cache_path, metadata_cache_path, bytes, headers);
                     Ok(json)
                 } else if resp.status() == StatusCode::NOT_MODIFIED {
                     from_file_cache(&body_cache_path)

src/merchandise_list.rs

@@ -11,8 +11,7 @@ use std::{println as info, println as error};
 
 use crate::{
     cache::file_cache_dir, cache::from_file_cache, cache::load_metadata_from_file_cache,
-    cache::update_file_cache, cache::update_file_caches, cache::update_metadata_file_cache,
-    log_server_error, result::FFIResult,
+    cache::update_file_caches, log_server_error, result::FFIResult,
 };
 
 #[derive(Serialize, Deserialize, Debug, Clone)]
@@ -124,14 +123,10 @@ pub extern "C" fn create_merchandise_list(
         let bytes = resp.bytes()?;
         let json: MerchandiseList = serde_json::from_slice(&bytes)?;
         if let Some(id) = json.id {
-            update_file_cache(
-                &cache_dir.join(format!("merchandise_list_{}.json", id)),
-                &bytes,
-            )?;
-            update_metadata_file_cache(
-                &cache_dir.join(format!("merchandise_list_{}_metadata.json", id)),
-                &headers,
-            )?;
+            let body_cache_path = cache_dir.join(format!("merchandise_list_{}.json", id));
+            let metadata_cache_path =
+                cache_dir.join(format!("merchandise_list_{}_metadata.json", id));
+            update_file_caches(body_cache_path, metadata_cache_path, bytes, headers);
         }
         Ok(json)
     }
@@ -208,8 +203,10 @@ pub extern "C" fn update_merchandise_list(
         let body_cache_path = cache_dir.join(format!("shop_{}_merchandise_list.json", shop_id));
         let metadata_cache_path =
             cache_dir.join(format!("shop_{}_merchandise_list_metadata.json", shop_id));
-        let bytes = update_file_caches(&body_cache_path, &metadata_cache_path, resp)?;
+        let headers = resp.headers().clone();
+        let bytes = resp.bytes()?;
         let json: MerchandiseList = serde_json::from_slice(&bytes)?;
+        update_file_caches(body_cache_path, metadata_cache_path, bytes, headers);
         Ok(json)
     }
 
@@ -284,8 +281,10 @@ pub extern "C" fn get_merchandise_list(
             Ok(resp) => {
                 info!("get_merchandise_list response from api: {:?}", &resp);
                 if resp.status().is_success() {
-                    let bytes = update_file_caches(&body_cache_path, &metadata_cache_path, resp)?;
+                    let headers = resp.headers().clone();
+                    let bytes = resp.bytes()?;
                     let json = serde_json::from_slice(&bytes)?;
+                    update_file_caches(body_cache_path, metadata_cache_path, bytes, headers);
                     Ok(json)
                 } else if resp.status() == StatusCode::NOT_MODIFIED {
                     from_file_cache(&body_cache_path)
@@ -377,8 +376,10 @@ pub extern "C" fn get_merchandise_list_by_shop_id(
                     &resp
                 );
                 if resp.status().is_success() {
-                    let bytes = update_file_caches(&body_cache_path, &metadata_cache_path, resp)?;
+                    let headers = resp.headers().clone();
+                    let bytes = resp.bytes()?;
                     let json = serde_json::from_slice(&bytes)?;
+                    update_file_caches(body_cache_path, metadata_cache_path, bytes, headers);
                     Ok(json)
                 } else if resp.status() == StatusCode::NOT_MODIFIED {
                     from_file_cache(&body_cache_path)

src/owner.rs

@@ -9,10 +9,7 @@ use log::{error, info};
 #[cfg(test)]
 use std::{println as info, println as error};
 
-use crate::{
-    cache::file_cache_dir, cache::update_file_cache, cache::update_file_caches,
-    cache::update_metadata_file_cache, result::FFIResult,
-};
+use crate::{cache::file_cache_dir, cache::update_file_caches, result::FFIResult};
 
 #[derive(Serialize, Deserialize, Debug)]
 pub struct Owner {
@@ -78,11 +75,9 @@ pub extern "C" fn create_owner(
             let bytes = resp.bytes()?;
             let json: Owner = serde_json::from_slice(&bytes)?;
             if let Some(id) = json.id {
-                update_file_cache(&cache_dir.join(format!("owner_{}.json", id)), &bytes)?;
-                update_metadata_file_cache(
-                    &cache_dir.join(format!("owner_{}_metadata.json", id)),
-                    &headers,
-                )?;
+                let body_cache_path = cache_dir.join(format!("owner_{}.json", id));
+                let metadata_cache_path = cache_dir.join(format!("owner_{}_metadata.json", id));
+                update_file_caches(body_cache_path, metadata_cache_path, bytes, headers);
             }
             Ok(json)
         } else {
@@ -155,8 +150,10 @@ pub extern "C" fn update_owner(
             let cache_dir = file_cache_dir(api_url)?;
             let body_cache_path = cache_dir.join(format!("owner_{}.json", id));
             let metadata_cache_path = cache_dir.join(format!("owner_{}_metadata.json", id));
-            let bytes = update_file_caches(&body_cache_path, &metadata_cache_path, resp)?;
+            let headers = resp.headers().clone();
+            let bytes = resp.bytes()?;
             let json: Owner = serde_json::from_slice(&bytes)?;
+            update_file_caches(body_cache_path, metadata_cache_path, bytes, headers);
             Ok(json)
         } else {
             Err(anyhow!("api-key not defined"))

src/shop.rs

@@ -11,8 +11,7 @@ use std::{println as info, println as error};
 
 use crate::{
     cache::file_cache_dir, cache::from_file_cache, cache::load_metadata_from_file_cache,
-    cache::update_file_cache, cache::update_file_caches, cache::update_metadata_file_cache,
-    log_server_error, result::FFIResult,
+    cache::update_file_caches, log_server_error, result::FFIResult,
 };
 
 #[derive(Serialize, Deserialize, Debug)]
@@ -117,11 +116,9 @@ pub extern "C" fn create_shop(
         let bytes = resp.bytes()?;
         let json: Shop = serde_json::from_slice(&bytes)?;
         if let Some(id) = json.id {
-            update_file_cache(&cache_dir.join(format!("shop_{}.json", id)), &bytes)?;
-            update_metadata_file_cache(
-                &cache_dir.join(format!("shop_{}_metadata.json", id)),
-                &headers,
-            )?;
+            let body_cache_path = cache_dir.join(format!("shop_{}.json", id));
+            let metadata_cache_path = cache_dir.join(format!("shop_{}_metadata.json", id));
+            update_file_caches(body_cache_path, metadata_cache_path, bytes, headers);
         }
         Ok(json)
     }
@@ -188,8 +185,10 @@ pub extern "C" fn update_shop(
         let cache_dir = file_cache_dir(api_url)?;
         let body_cache_path = cache_dir.join(format!("shop_{}.json", id));
         let metadata_cache_path = cache_dir.join(format!("shop_{}_metadata.json", id));
-        let bytes = update_file_caches(&body_cache_path, &metadata_cache_path, resp)?;
+        let headers = resp.headers().clone();
+        let bytes = resp.bytes()?;
         let json: Shop = serde_json::from_slice(&bytes)?;
+        update_file_caches(body_cache_path, metadata_cache_path, bytes, headers);
         Ok(json)
     }
 
@@ -255,8 +254,10 @@ pub extern "C" fn get_shop(
             Ok(resp) => {
                 info!("get_shop response from api: {:?}", &resp);
                 if resp.status().is_success() {
-                    let bytes = update_file_caches(&body_cache_path, &metadata_cache_path, resp)?;
+                    let headers = resp.headers().clone();
+                    let bytes = resp.bytes()?;
                     let json = serde_json::from_slice(&bytes)?;
+                    update_file_caches(body_cache_path, metadata_cache_path, bytes, headers);
                     Ok(json)
                 } else if resp.status() == StatusCode::NOT_MODIFIED {
                     from_file_cache(&body_cache_path)
@@ -329,8 +330,10 @@ pub extern "C" fn list_shops(
             Ok(resp) => {
                 info!("list_shops response from api: {:?}", &resp);
                 if resp.status().is_success() {
-                    let bytes = update_file_caches(&body_cache_path, &metadata_cache_path, resp)?;
+                    let headers = resp.headers().clone();
+                    let bytes = resp.bytes()?;
                     let json = serde_json::from_slice(&bytes)?;
+                    update_file_caches(body_cache_path, metadata_cache_path, bytes, headers);
                     Ok(json)
                 } else if resp.status() == StatusCode::NOT_MODIFIED {
                     from_file_cache(&body_cache_path)

src/transaction.rs

@@ -1,4 +1,4 @@
-use std::{convert::TryFrom, ffi::CStr, ffi::CString, os::raw::c_char, slice, str};
+use std::{convert::TryFrom, ffi::CStr, ffi::CString, os::raw::c_char, slice, str, thread};
 
 use anyhow::{anyhow, Result};
 use http_api_problem::HttpApiProblem;
@@ -11,8 +11,8 @@ use log::{error, info};
 use std::{println as info, println as error};
 
 use crate::{
-    cache::file_cache_dir, cache::from_file_cache, cache::update_file_cache,
-    cache::update_metadata_file_cache, log_server_error, result::FFIResult,
+    cache::file_cache_dir, cache::from_file_cache, cache::update_file_caches, log_server_error,
+    result::FFIResult,
 };
 
 #[derive(Serialize, Deserialize, Debug)]
@@ -165,11 +165,10 @@ pub extern "C" fn create_transaction(
         if status.is_success() {
             let json: Transaction = serde_json::from_slice(&bytes)?;
             if let Some(id) = json.id {
-                update_file_cache(&cache_dir.join(format!("transaction_{}.json", id)), &bytes)?;
-                update_metadata_file_cache(
-                    &cache_dir.join(format!("transaction_{}_metadata.json", id)),
-                    &headers,
-                )?;
+                let body_cache_path = cache_dir.join(format!("transaction_{}.json", id));
+                let metadata_cache_path =
+                    cache_dir.join(format!("transaction_{}_metadata.json", id));
+                update_file_caches(body_cache_path, metadata_cache_path, bytes, headers);
             }
             Ok(json)
         } else {