fixed mirroring issues

hf_server.js

@@ -3,7 +3,7 @@
  * All rights reserved.
  */
 //@ts-check
-const VERSION = '0.6.0.hf.014.l';
+const VERSION = '0.6.0.hf.014.m';
 
 const express = require('express');
 const http = require('http');
@@ -28,7 +28,7 @@ const OMNITOOL_SPACE_URL = "omnitool-ai-omnitool-on-hf.hf.space";
 const HF_SPACE_URL = "https://huggingface.co/spaces/omnitool-ai/omnitool_on_hf";
 const HF_SPACE_DUPLICATE_URL = "https://huggingface.co/spaces/omnitool-ai/omnitool_on_hf?duplicate=true";
 
-const sourceDir = './omnitool/packages/omni-server/data.local';
+const sourceDir = 'omnitool/packages/omni-server/data.local';
 const targetDir = '/data';
 
 const DELAY_OMNITOOL_SET_TO_RUNNING = 2000; // 2 seconds
@@ -113,10 +113,13 @@ async function startOmnitoolServer()
             global.logs.push(data.toString());
             console.log(`omnitool stdout: ${data}`);
 
-            if (data.toString().includes(`Server has started and is ready to accept connections`))
+            if (!global.OMNITOOL_RUNNING)
             {
-                console.log('Omnitool server started successfully');
-                setOmnitoolRunning(true);
+                if (data.toString().includes(`Server has started and is ready to accept connections`))
+                {
+                    console.log('Omnitool server started successfully');
+                    setOmnitoolRunning(true);
+                }
             }
 
         });
@@ -308,11 +311,9 @@ function getButtonsString(buttonsHTML)
   
                         
                     }
-
+                    
                     function exitIframe() {
-                        fetch('/burst-iframe')
-                            .then(response => response.json())
-                            .then(data => window.open('/', '_blank'));
+                        fetch('/burst-iframe').then(response => response.json()).then(data => {window.open('/', '_blank');});
                     }
 
                     function startLogPolling() {
@@ -534,17 +535,20 @@ function startMirrorToDataDir()
     });
 
     watcher
-        .on('add', function(path) {
-            if (path.includes('-journal')) return;
+        .on('add', function(file_path) {
+            //if (file_path.includes('-journal') || file_path.includes('httpd.db')) return;
 
-            const targetFile = path.replace(sourceDir, targetDir);
-            //console.warn(`TargetFile = ${targetFile}. File ${path} would have been added and copied from ${sourceDir} to ${targetDir}`);
+            const targetFile = file_path.replace(sourceDir, targetDir);
+            //console.warn(`TargetFile = ${targetFile}. File ${file_path} added and copied from ${sourceDir} to ${targetDir}`);
             try {
-                fs.copyFile(path, targetFile, (err) => {
+                fsExtra.ensureDirSync(path.dirname(targetFile));
+                fs.copyFile(file_path, targetFile, (err) => {
                 if (err) 
                 {
                     //throw err;
-                    console.error('ERROR when doing: File', path, 'added -> copied to', targetFile);
+                    const error_message = `ERROR when doing: File ${file_path} added -> copied to ${targetFile}`;
+                    console.log(error_message);
+                    global.logs.push(error_message);
                 }});
             }
             catch(error)
@@ -552,17 +556,20 @@ function startMirrorToDataDir()
                 console.error(`WATCHER: error: ${error}`);
             }
         })
-        .on('change', function(path) {
-            if (path.includes('-journal')) return;
-
-            const targetFile = path.replace(sourceDir, targetDir);
-            //console.warn(`TargetFile = ${targetFile}. File ${path} would have been changed and copied from ${sourceDir} to ${targetDir}`);
+        .on('change', function(file_path) {
+            //if (file_path.includes('-journal') || file_path.includes('httpd.db')) return;
+            
+            const targetFile = file_path.replace(sourceDir, targetDir);
+            //console.warn(`TargetFile = ${targetFile}. File ${file_path} changed and copied from ${sourceDir} to ${targetDir}`);
             try{
-                fs.copyFile(path, targetFile, (err) => {
+                fsExtra.ensureDirSync(path.dirname(targetFile));
+                fs.copyFile(file_path, targetFile, (err) => {
                 if (err) 
                 {
                     //throw err;
-                    console.error('ERROR when doing: File', path, 'has been changed and copied to', targetFile);
+                    const error_message = `ERROR when doing: File ${file_path} changed -> copied to ${targetFile}`;
+                    console.log(error_message);
+                    global.logs.push(error_message);
                 }
                 });
             }
@@ -572,18 +579,21 @@ function startMirrorToDataDir()
             }
             
         })
-        .on('unlink', function(path) {
-            if (path.includes('-journal')) return;
+        .on('unlink', function(file_path) {
+            //if (file_path.includes('-journal') || file_path.includes('httpd.db')) return;
 
-            const targetFile = path.replace(sourceDir, targetDir);
-            //console.warn(`TargetFile = ${targetFile}. File ${path} would have been removed from ${targetDir}`);
+            const targetFile = file_path.replace(sourceDir, targetDir);
+            //console.warn(`TargetFile = ${targetFile}. File ${file_path} removed from ${targetDir}`);
             try
             {
+                fsExtra.ensureDirSync(path.dirname(targetFile));
                 fs.unlink(targetFile, (err) => {
                 if (err) 
                 {
                     // throw err;
-                    console.log('ERROR when doing: File', path, 'has been removed');
+                    const error_message = `ERROR when doing: File ${file_path} has been removed from ${targetDir}`;
+                    console.log(error_message);
+                    global.logs.push(error_message);
                 }
                 });
             }

omnitool_init.sh

@@ -28,6 +28,9 @@ fi
 echo "[->] UPDATE OMNITOOL if needed"
 cd ./omnitool
 output=$(git pull)
+
+mkdir -p ./data
+
 if echo "$output" | grep -q "Already up to date."; then
   echo "The repository is already up to date."
 else