starred/yaak-mountain-loop
1
0
Fork 0
mirror of https://github.com/mountain-loop/yaak.git synced 2026-05-18 05:37:09 +02:00
Code Issues 8 Packages Projects Releases 10 Wiki Activity

Track HTTP setting sources in timeline

Browse Source
This commit is contained in:
Gregory Schier
2026-05-17 10:07:12 -07:00
parent 0c97036864
commit 0a6aed6cc6
13 changed files with 1109 additions and 182 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/yaak-models/bindings/gen_models.ts
Generated
+8 -1
View File
@@ -258,7 +258,14 @@ export type HttpResponseEvent = {
* The `From` impl is in yaak-http to avoid circular dependencies.
*/
export type HttpResponseEventData =
| { type: "setting"; name: string; value: string }
| {
type: "setting";
name: string;
value: string;
source_model?: string;
source_id?: string;
source_name?: string;
}
| { type: "info"; message: string }
| {
type: "redirect";
crates/yaak-models/src/models.rs
+42 -10
View File
@@ -92,23 +92,46 @@ pub struct DnsOverride {
pub enabled: bool,
}
#[derive(Debug, Clone, PartialEq, Default)]
pub struct ResolvedSetting<T> {
pub value: T,
pub source_model: String,
pub source_id: Option<String>,
pub source_name: Option<String>,
}
impl<T> ResolvedSetting<T> {
pub fn from_model(value: T, model: AnyModel) -> Self {
Self {
value,
source_model: model.model().to_string(),
source_id: Some(model.id().to_string()),
source_name: Some(model.resolved_name()),
}
}
pub fn default_source(value: T) -> Self {
Self { value, source_model: "default".to_string(), source_id: None, source_name: None }
}
}
#[derive(Debug, Clone, PartialEq)]
pub struct ResolvedHttpRequestSettings {
pub validate_certificates: bool,
pub follow_redirects: bool,
pub request_timeout: i32,
pub send_cookies: bool,
pub store_cookies: bool,
pub validate_certificates: ResolvedSetting<bool>,
pub follow_redirects: ResolvedSetting<bool>,
pub request_timeout: ResolvedSetting<i32>,
pub send_cookies: ResolvedSetting<bool>,
pub store_cookies: ResolvedSetting<bool>,
}
impl Default for ResolvedHttpRequestSettings {
fn default() -> Self {
Self {
validate_certificates: true,
follow_redirects: true,
request_timeout: 0,
send_cookies: true,
store_cookies: true,
validate_certificates: ResolvedSetting::default_source(true),
follow_redirects: ResolvedSetting::default_source(true),
request_timeout: ResolvedSetting::default_source(0),
send_cookies: ResolvedSetting::default_source(true),
store_cookies: ResolvedSetting::default_source(true),
}
}
}
@@ -1748,6 +1771,15 @@ pub enum HttpResponseEventData {
Setting {
name: String,
value: String,
#[serde(default, skip_serializing_if = "Option::is_none")]
#[ts(optional, as = "Option<String>")]
source_model: Option<String>,
#[serde(default, skip_serializing_if = "Option::is_none")]
#[ts(optional, as = "Option<String>")]
source_id: Option<String>,
#[serde(default, skip_serializing_if = "Option::is_none")]
#[ts(optional, as = "Option<String>")]
source_name: Option<String>,
},
Info {
message: String,
crates/yaak-models/src/queries/folders.rs
+23 -8
View File
@@ -2,9 +2,9 @@ use crate::client_db::ClientDb;
use crate::connection_or_tx::ConnectionOrTx;
use crate::error::Result;
use crate::models::{
Environment, EnvironmentIden, Folder, FolderIden, GrpcRequest, GrpcRequestIden, HttpRequest,
HttpRequestHeader, HttpRequestIden, ResolvedHttpRequestSettings, WebsocketRequest,
WebsocketRequestIden,
AnyModel, Environment, EnvironmentIden, Folder, FolderIden, GrpcRequest, GrpcRequestIden,
HttpRequest, HttpRequestHeader, HttpRequestIden, ResolvedHttpRequestSettings, ResolvedSetting,
WebsocketRequest, WebsocketRequestIden,
};
use crate::util::UpdateSource;
use serde_json::Value;
@@ -157,27 +157,42 @@ impl<'a> ClientDb<'a> {
Ok(ResolvedHttpRequestSettings {
validate_certificates: if folder.setting_validate_certificates.enabled {
folder.setting_validate_certificates.value
ResolvedSetting::from_model(
folder.setting_validate_certificates.value,
AnyModel::Folder(folder.clone()),
)
} else {
parent.validate_certificates
},
follow_redirects: if folder.setting_follow_redirects.enabled {
folder.setting_follow_redirects.value
ResolvedSetting::from_model(
folder.setting_follow_redirects.value,
AnyModel::Folder(folder.clone()),
)
} else {
parent.follow_redirects
},
request_timeout: if folder.setting_request_timeout.enabled {
folder.setting_request_timeout.value
ResolvedSetting::from_model(
folder.setting_request_timeout.value,
AnyModel::Folder(folder.clone()),
)
} else {
parent.request_timeout
},
send_cookies: if folder.setting_send_cookies.enabled {
folder.setting_send_cookies.value
ResolvedSetting::from_model(
folder.setting_send_cookies.value,
AnyModel::Folder(folder.clone()),
)
} else {
parent.send_cookies
},
store_cookies: if folder.setting_store_cookies.enabled {
folder.setting_store_cookies.value
ResolvedSetting::from_model(
folder.setting_store_cookies.value,
AnyModel::Folder(folder.clone()),
)
} else {
parent.store_cookies
},
crates/yaak-models/src/queries/http_requests.rs
+22 -7
View File
@@ -2,8 +2,8 @@ use super::dedupe_headers;
use crate::client_db::ClientDb;
use crate::error::Result;
use crate::models::{
Folder, FolderIden, HttpRequest, HttpRequestHeader, HttpRequestIden,
ResolvedHttpRequestSettings,
AnyModel, Folder, FolderIden, HttpRequest, HttpRequestHeader, HttpRequestIden,
ResolvedHttpRequestSettings, ResolvedSetting,
};
use crate::util::UpdateSource;
use serde_json::Value;
@@ -108,27 +108,42 @@ impl<'a> ClientDb<'a> {
Ok(ResolvedHttpRequestSettings {
validate_certificates: if http_request.setting_validate_certificates.enabled {
http_request.setting_validate_certificates.value
ResolvedSetting::from_model(
http_request.setting_validate_certificates.value,
AnyModel::HttpRequest(http_request.clone()),
)
} else {
parent.validate_certificates
},
follow_redirects: if http_request.setting_follow_redirects.enabled {
http_request.setting_follow_redirects.value
ResolvedSetting::from_model(
http_request.setting_follow_redirects.value,
AnyModel::HttpRequest(http_request.clone()),
)
} else {
parent.follow_redirects
},
request_timeout: if http_request.setting_request_timeout.enabled {
http_request.setting_request_timeout.value
ResolvedSetting::from_model(
http_request.setting_request_timeout.value,
AnyModel::HttpRequest(http_request.clone()),
)
} else {
parent.request_timeout
},
send_cookies: if http_request.setting_send_cookies.enabled {
http_request.setting_send_cookies.value
ResolvedSetting::from_model(
http_request.setting_send_cookies.value,
AnyModel::HttpRequest(http_request.clone()),
)
} else {
parent.send_cookies
},
store_cookies: if http_request.setting_store_cookies.enabled {
http_request.setting_store_cookies.value
ResolvedSetting::from_model(
http_request.setting_store_cookies.value,
AnyModel::HttpRequest(http_request.clone()),
)
} else {
parent.store_cookies
},
crates/yaak-models/src/queries/websocket_requests.rs
+10 -4
View File
@@ -2,8 +2,8 @@ use super::dedupe_headers;
use crate::client_db::ClientDb;
use crate::error::Result;
use crate::models::{
Folder, FolderIden, HttpRequestHeader, ResolvedHttpRequestSettings, WebsocketRequest,
WebsocketRequestIden,
AnyModel, Folder, FolderIden, HttpRequestHeader, ResolvedHttpRequestSettings, ResolvedSetting,
WebsocketRequest, WebsocketRequestIden,
};
use crate::util::UpdateSource;
use serde_json::Value;
@@ -132,12 +132,18 @@ impl<'a> ClientDb<'a> {
Ok(ResolvedHttpRequestSettings {
send_cookies: if websocket_request.setting_send_cookies.enabled {
websocket_request.setting_send_cookies.value
ResolvedSetting::from_model(
websocket_request.setting_send_cookies.value,
AnyModel::WebsocketRequest(websocket_request.clone()),
)
} else {
parent.send_cookies
},
store_cookies: if websocket_request.setting_store_cookies.enabled {
websocket_request.setting_store_cookies.value
ResolvedSetting::from_model(
websocket_request.setting_store_cookies.value,
AnyModel::WebsocketRequest(websocket_request.clone()),
)
} else {
parent.store_cookies
},
crates/yaak-models/src/queries/workspaces.rs
+22 -7
View File
@@ -1,8 +1,8 @@
use crate::client_db::ClientDb;
use crate::error::Result;
use crate::models::{
EnvironmentIden, FolderIden, GrpcRequestIden, HttpRequestHeader, HttpRequestIden,
ResolvedHttpRequestSettings, WebsocketRequestIden, Workspace, WorkspaceIden,
AnyModel, EnvironmentIden, FolderIden, GrpcRequestIden, HttpRequestHeader, HttpRequestIden,
ResolvedHttpRequestSettings, ResolvedSetting, WebsocketRequestIden, Workspace, WorkspaceIden,
};
use crate::util::UpdateSource;
use serde_json::Value;
@@ -90,11 +90,26 @@ impl<'a> ClientDb<'a> {
workspace: &Workspace,
) -> ResolvedHttpRequestSettings {
ResolvedHttpRequestSettings {
validate_certificates: workspace.setting_validate_certificates,
follow_redirects: workspace.setting_follow_redirects,
request_timeout: workspace.setting_request_timeout,
send_cookies: workspace.setting_send_cookies,
store_cookies: workspace.setting_store_cookies,
validate_certificates: ResolvedSetting::from_model(
workspace.setting_validate_certificates,
AnyModel::Workspace(workspace.clone()),
),
follow_redirects: ResolvedSetting::from_model(
workspace.setting_follow_redirects,
AnyModel::Workspace(workspace.clone()),
),
request_timeout: ResolvedSetting::from_model(
workspace.setting_request_timeout,
AnyModel::Workspace(workspace.clone()),
),
send_cookies: ResolvedSetting::from_model(
workspace.setting_send_cookies,
AnyModel::Workspace(workspace.clone()),
),
store_cookies: ResolvedSetting::from_model(
workspace.setting_store_cookies,
AnyModel::Workspace(workspace.clone()),
),
}
}
}