Merge pull request #39 from CoLearn-Dev/reverse-mode-bugfix

- change user_init_config.toml file location; bugfix

Author: stneng

.gitignore

@@ -3,3 +3,4 @@
 /.vscode
 host_token.txt
 /init_state
+user_init_config.toml

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "colink-server"
-version = "0.2.1"
+version = "0.2.2"
 edition = "2021"
 
 [dependencies]

Cargo.toml

@@ -363,7 +363,7 @@ impl crate::server::MyService {
             Err(e) => return Err(Status::internal(format!("{}", e))),
         };
 
-        let inter_core_reverse_handlers = self.inter_core_reverse_handlers.lock().await;
+        let mut inter_core_reverse_handlers = self.inter_core_reverse_handlers.lock().await;
         if inter_core_reverse_handlers
             .contains_key(&(user_id.to_string(), target_user_id.to_string()))
             && !inter_core_reverse_handlers
@@ -400,9 +400,7 @@ impl crate::server::MyService {
             }
             Ok::<(), Box<dyn std::error::Error + Send + Sync + 'static>>(())
         });
-        self.inter_core_reverse_handlers
-            .lock()
-            .await
+        inter_core_reverse_handlers
             .insert((user_id.to_string(), target_user_id.to_string()), handler);
         Ok(())
     }

src/service/task.rs

@@ -1,18 +1,17 @@
 use super::utils::*;
 use crate::{colink_proto::*, server::MyService};
-use std::{path::Path, sync::Arc};
+use std::sync::Arc;
 use toml::Value;
 
 pub async fn user_init(
     service: Arc<MyService>,
     user_id: &str,
     user_jwt: &str,
 ) -> Result<(), Box<dyn std::error::Error + Send + Sync + 'static>> {
-    let colink_home = service.get_colink_home()?;
-    let mut path = Path::new(&colink_home).join("user_init_config.toml");
-    if std::fs::metadata(&path).is_err() {
-        path = Path::new("user_init_config.template.toml").to_path_buf();
-    }
+    let path = match service.find_resource_file("user_init_config.toml") {
+        Ok(path) => path,
+        Err(_) => service.find_resource_file("user_init_config.template.toml")?,
+    };
     let toml = match std::fs::read_to_string(&path).unwrap().parse::<Value>() {
         Ok(toml) => toml,
         Err(err) => Err(err.to_string())?,

src/service/user_init.rs

@@ -3,6 +3,7 @@ use futures_lite::StreamExt;
 use secp256k1::{ecdsa::Signature, PublicKey, Secp256k1};
 use sha2::{Digest, Sha256};
 use std::io::{self, Seek, SeekFrom, Write};
+use std::path::{Path, PathBuf};
 use std::process::Command;
 use tonic::{
     metadata::{MetadataMap, MetadataValue},
@@ -264,6 +265,19 @@ impl crate::server::MyService {
         };
         Ok(colink_home)
     }
+
+    pub fn find_resource_file(&self, file_name: &str) -> Result<PathBuf, Status> {
+        let colink_home = self.get_colink_home()?;
+        let mut path = Path::new(file_name).to_path_buf();
+        if std::fs::metadata(&path).is_err() {
+            path = Path::new(&colink_home).join(file_name);
+        }
+        if std::fs::metadata(&path).is_ok() {
+            Ok(path)
+        } else {
+            Err(Status::not_found(file_name.to_string()))
+        }
+    }
 }
 
 pub fn generate_request<T>(jwt: &str, data: T) -> tonic::Request<T> {