Moved IPFS lock from js to rust

executor/src/core/PerspectivismCore.ts

@@ -139,20 +139,6 @@ export default class PerspectivismCore {
 
     async initIPFS(params: InitIPFSParams) {
         console.log("Init IPFS service with port ", params.ipfsSwarmPort, " at path: ", params.ipfsRepoPath);
-        let basePath = params.ipfsRepoPath ? params.ipfsRepoPath : path.join(this.#config.dataPath, "ipfs");
-        let repoPath = path.join(basePath, "repo.lock");
-        console.log("Check if repo.lock exists at: ", repoPath);
-
-        let retries = 0;
-        while (fs.existsSync(repoPath)) {
-            await sleep(1000);
-            retries++;
-            if (retries >= 10) {
-                console.log("Waited long enough for repo.lock to be released, deleting...");
-                fs.rmdirSync(repoPath, { recursive: true });
-                fs.rmSync(path.join(basePath, "datastore", "LOCK"));
-            }
-        }
 
         let ipfs = await IPFS.init(params.ipfsSwarmPort, params.ipfsRepoPath);
         this.#IPFS = ipfs;

ui/src-tauri/src/main.rs

@@ -74,6 +74,18 @@ fn main() {
         let _ = remove_dir_all(data_path());
     }
 
+    let mut waited_seconds = 0;
+    while data_path().join("ipfs").join("repo.lock").exists() {
+        println!("IPFS repo.lock exists, waiting...");
+        std::thread::sleep(std::time::Duration::from_secs(1));
+        waited_seconds = waited_seconds + 1;
+        if waited_seconds > 10 {
+            println!("Waited long enough, removing lock...");
+            let _ = remove_dir_all(data_path().join("ipfs").join("repo.lock"));
+            let _ = remove_dir_all(data_path().join("ipfs").join("datastore").join("LOCK"));
+        }
+    }
+
     if let Err(err) = setup_logs() {
         println!("Error setting up the logs: {:?}", err);
     }