chore: Address miscellaneous changes

Author: SersemPeca

LICENSE

@@ -660,4 +660,8 @@ if any, to sign a "copyright disclaimer" for the program, if necessary.
 For more information on this, and how to apply and follow the GNU AGPL, see
 <https://www.gnu.org/licenses/>.
 
+Wasm-sysroot licensing
+
+-------------------
+
 The wasm-sysroot is copied from the tree-sitter repo: (https://github.com/tree-sitter/tree-sitter) : specifically https://github.com/tree-sitter/tree-sitter/tree/master/crates/language/wasm/include. The C headers there are a modified version of glibc headers, which are originally under LGPL license.

README.md

@@ -20,18 +20,18 @@ Key signatures:
 
 > [!TIP]
 > You can place the downloaded app in a location of your choosing (e.g., the `Applications` folder on macOS or `~/.local/bin` on Linux).
-> 
+>
 > When you launch CodeTracer for the first time, it will prompt you to complete the remaining installation steps, such as adding the command-line utilities to your PATH.
 
-> [!CAUTION]  
+> [!CAUTION]
 > Upon the first launch, macOS users will see the error message "CodeTracer is damaged and can't be opened". To resolve this problem, please execute the command `user $ xattr -c <path/to/CodeTracer.app>`.
 >
 > We expect this inconvenience will be remedied soon through our enrollment in the Apple Developer program which will ensure CodeTracer is properly signed and whitelisted by Apple.
 > See [this discussion](https://discussions.apple.com/thread/253714860?sortBy=rank) for more details.
 
 > [!CAUTION]
 > Recording ruby on macOS requires you to install ruby through [homebrew](https://brew.sh), otherwise trying to record ruby programs will fail due to the built-in ruby binary on macOS being more than 7 years old.
-> 
+>
 > Once homebrew is installed, simply install ruby with `user $ brew install ruby`.
 
 # Introduction
@@ -228,3 +228,5 @@ Check out our [Contributors Guide](./CONTRIBUTING.md) for more details.
 ## License
 
 CodeTracer is distributed under the GNU Affero General Public License (AGPLv3).
+
+The wasm-sysroot is copied from the tree-sitter repo: (https://github.com/tree-sitter/tree-sitter) : specifically https://github.com/tree-sitter/tree-sitter/tree/master/crates/language/wasm/include. The C headers there are a modified version of glibc headers, which are originally under LGPL license.

src/db-backend/src/dap.rs

@@ -1,3 +1,6 @@
+#[cfg(feature = "browser-transport")]
+use crate::dap_error::DapError;
+
 use crate::dap_types::{self, OutputEventBody, SetBreakpointsArguments, StoppedEventBody};
 use crate::task::{self, CtUpdatedTableResponseBody};
 use crate::transport::DapResult;

src/db-backend/src/dap_server.rs

@@ -5,9 +5,9 @@ use crate::db::Db;
 use crate::handler::Handler;
 use crate::paths::CODETRACER_PATHS;
 use crate::task::{
-    gen_task_id, Action, CallSearchArg, CalltraceLoadArgs, CollapseCallsArgs, CtLoadLocalsArguments, FunctionLocation,
-    LoadHistoryArg, LocalStepJump, Location, ProgramEvent, RunTracepointsArg, SourceCallJumpTarget, SourceLocation,
-    StepArg, Task, TaskKind, TracepointId, UpdateTableArgs,
+    gen_task_id, Action, CallSearchArg, CalltraceLoadArgs, CollapseCallsArgs, CtLoadFlowArguments,
+    CtLoadLocalsArguments, FunctionLocation, LoadHistoryArg, LocalStepJump, Location, ProgramEvent, RunTracepointsArg,
+    SourceCallJumpTarget, SourceLocation, StepArg, Task, TaskKind, TracepointId, UpdateTableArgs,
 };
 
 use crate::trace_processor::{load_trace_data, load_trace_metadata, TraceProcessor};
@@ -195,7 +195,7 @@ fn handle_request<T: DapTransport>(
         "ct/tracepoint-toggle" => handler.tracepoint_toggle(req.clone(), req.load_args::<TracepointId>()?)?,
         "ct/tracepoint-delete" => handler.tracepoint_delete(req.clone(), req.load_args::<TracepointId>()?)?,
         "ct/trace-jump" => handler.trace_jump(req.clone(), req.load_args::<ProgramEvent>()?)?,
-        "ct/load-flow" => handler.load_flow(req.clone(), req.load_args::<Location>()?)?,
+        "ct/load-flow" => handler.load_flow(req.clone(), req.load_args::<CtLoadFlowArguments>()?)?,
         "ct/run-to-entry" => handler.run_to_entry(req.clone())?,
         "ct/run-tracepoints" => handler.run_tracepoints(req.clone(), req.load_args::<RunTracepointsArg>()?)?,
         "ct/setup-trace-session" => handler.setup_trace_session(req.clone(), req.load_args::<RunTracepointsArg>()?)?,

src/db-backend/src/main.rs

@@ -120,20 +120,35 @@ fn main() -> Result<(), Box<dyn Error>> {
     info!("logging from db-backend");
 
     info!("pid {:?}", std::process::id());
-    if cli.stdio {
-        let _ = db_backend::dap_server::run_stdio();
-    } else {
-        let socket_path = if let Some(p) = cli.socket_path {
-            p
-        } else {
-            let pid = std::process::id() as usize;
-            db_backend::dap_server::socket_path_for(pid)
-        };
-
-        info!("dap_server::run {:?}", socket_path);
-
-        let _ = db_backend::dap_server::run(&socket_path);
-    };
+
+    match cli.cmd {
+        Commands::DapServer { socket_path, stdio } => {
+            if stdio {
+                let _ = db_backend::dap_server::run_stdio();
+            } else {
+                let socket_path = if let Some(p) = socket_path {
+                    p
+                } else {
+                    let pid = std::process::id() as usize;
+                    db_backend::dap_server::socket_path_for(pid)
+                };
+
+                info!("dap_server::run {:?}", socket_path);
+
+                let _ = db_backend::dap_server::run(&socket_path);
+            };
+        }
+        Commands::IndexDiff {
+            structured_diff_path,
+            trace_folder,
+            multitrace_folder,
+        } => {
+            let raw = std::fs::read_to_string(structured_diff_path)?;
+            info!("raw {raw:?}");
+            let structured_diff = serde_json::from_str::<diff::Diff>(&raw)?;
+            diff::index_diff(structured_diff, &trace_folder, &multitrace_folder)?;
+        }
+    }
 
     Ok(())
 }

src/db-backend/tests/dap_backend_server.rs

@@ -41,8 +41,6 @@ fn test_backend_dap_server() {
     let socket_path = dap_server::socket_path_for(std::process::id() as usize);
     let mut child = Command::new(bin).arg("dap-server").arg(&socket_path).spawn().unwrap();
 
-    wait_for_socket(&socket_path);
-
     if let Some(dir) = socket_path.parent() {
         fs::create_dir_all(dir).unwrap_or_else(|err| panic!("failed to create socket directory {dir:?}: {err}"));
     }

src/db-backend/tree-sitter-trace/grammar.js

@@ -84,7 +84,7 @@ module.exports = grammar({
       ))
     ),
     logExpression: $ => seq(
-      choice("log", "покажи"),
+      choice("log", "покажи", "print"),
       "(",
       // based on https://stackoverflow.com/a/62803449/438099
       optional(seq($._expression, repeat(seq(",", $._expression)))),