starred/yaak-mountain-loop
1
0
Fork 0
mirror of https://github.com/mountain-loop/yaak.git synced 2026-03-26 19:31:12 +01:00
Code Issues 8 Packages Projects Releases 10 Wiki Activity

plugin:yaak-models|upsert PoC

Browse Source
This commit is contained in:
Gregory Schier
2025-03-26 09:54:42 -07:00
parent b7f62b78b1
commit 17657a4d04
31 changed files with 255 additions and 408 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src-tauri/capabilities/capabilities.json
View File

@@ -50,8 +50,9 @@
"opener:allow-open-url",
"opener:allow-reveal-item-in-dir",
"shell:allow-open",
"yaak-license:default",
"yaak-git:default",
"yaak-license:default",
"yaak-models:default",
"yaak-sync:default",
"yaak-ws:default"
]

2
src-tauri/gen/schemas/acl-manifests.json generated
View File

File diff suppressed because one or more lines are too long

2
src-tauri/gen/schemas/capabilities.json generated
View File

@@ -1 +1 @@
{"main":{"identifier":"main","description":"Main permissions","local":true,"windows":["*"],"permissions":["core:event:allow-emit","core:event:allow-listen","core:event:allow-unlisten","os:allow-os-type","clipboard-manager:allow-clear","clipboard-manager:allow-write-text","clipboard-manager:allow-read-text","dialog:allow-open","dialog:allow-save","fs:allow-read-dir","fs:allow-read-file","fs:allow-read-text-file",{"identifier":"fs:scope","allow":[{"path":"$APPDATA"},{"path":"$APPDATA/**"}]},"clipboard-manager:allow-read-text","clipboard-manager:allow-write-text","core:webview:allow-set-webview-zoom","core:window:allow-close","core:window:allow-internal-toggle-maximize","core:window:allow-is-fullscreen","core:window:allow-is-maximized","core:window:allow-maximize","core:window:allow-minimize","core:window:allow-set-decorations","core:window:allow-set-title","core:window:allow-show","core:window:allow-start-dragging","core:window:allow-theme","core:window:allow-unmaximize","opener:allow-default-urls","opener:allow-open-path","opener:allow-open-url","opener:allow-reveal-item-in-dir","shell:allow-open","yaak-license:default","yaak-git:default","yaak-sync:default","yaak-ws:default"]}}
{"main":{"identifier":"main","description":"Main permissions","local":true,"windows":["*"],"permissions":["core:event:allow-emit","core:event:allow-listen","core:event:allow-unlisten","os:allow-os-type","clipboard-manager:allow-clear","clipboard-manager:allow-write-text","clipboard-manager:allow-read-text","dialog:allow-open","dialog:allow-save","fs:allow-read-dir","fs:allow-read-file","fs:allow-read-text-file",{"identifier":"fs:scope","allow":[{"path":"$APPDATA"},{"path":"$APPDATA/**"}]},"clipboard-manager:allow-read-text","clipboard-manager:allow-write-text","core:webview:allow-set-webview-zoom","core:window:allow-close","core:window:allow-internal-toggle-maximize","core:window:allow-is-fullscreen","core:window:allow-is-maximized","core:window:allow-maximize","core:window:allow-minimize","core:window:allow-set-decorations","core:window:allow-set-title","core:window:allow-show","core:window:allow-start-dragging","core:window:allow-theme","core:window:allow-unmaximize","opener:allow-default-urls","opener:allow-open-path","opener:allow-open-url","opener:allow-reveal-item-in-dir","shell:allow-open","yaak-git:default","yaak-license:default","yaak-models:default","yaak-sync:default","yaak-ws:default"]}}

20
src-tauri/gen/schemas/desktop-schema.json generated
View File

@@ -5642,41 +5642,21 @@
"type": "string",
"const": "yaak-models:allow-delete"
},
{
"description": "Enables the delete_model command without any pre-configured scope.",
"type": "string",
"const": "yaak-models:allow-delete-model"
},
{
"description": "Enables the upsert command without any pre-configured scope.",
"type": "string",
"const": "yaak-models:allow-upsert"
},
{
"description": "Enables the upsert_model command without any pre-configured scope.",
"type": "string",
"const": "yaak-models:allow-upsert-model"
},
{
"description": "Denies the delete command without any pre-configured scope.",
"type": "string",
"const": "yaak-models:deny-delete"
},
{
"description": "Denies the delete_model command without any pre-configured scope.",
"type": "string",
"const": "yaak-models:deny-delete-model"
},
{
"description": "Denies the upsert command without any pre-configured scope.",
"type": "string",
"const": "yaak-models:deny-upsert"
},
{
"description": "Denies the upsert_model command without any pre-configured scope.",
"type": "string",
"const": "yaak-models:deny-upsert-model"
},
{
"description": "Default permissions for the plugin",
"type": "string",

20
src-tauri/gen/schemas/macOS-schema.json generated
View File

@@ -5642,41 +5642,21 @@
"type": "string",
"const": "yaak-models:allow-delete"
},
{
"description": "Enables the delete_model command without any pre-configured scope.",
"type": "string",
"const": "yaak-models:allow-delete-model"
},
{
"description": "Enables the upsert command without any pre-configured scope.",
"type": "string",
"const": "yaak-models:allow-upsert"
},
{
"description": "Enables the upsert_model command without any pre-configured scope.",
"type": "string",
"const": "yaak-models:allow-upsert-model"
},
{
"description": "Denies the delete command without any pre-configured scope.",
"type": "string",
"const": "yaak-models:deny-delete"
},
{
"description": "Denies the delete_model command without any pre-configured scope.",
"type": "string",
"const": "yaak-models:deny-delete-model"
},
{
"description": "Denies the upsert command without any pre-configured scope.",
"type": "string",
"const": "yaak-models:deny-upsert"
},
{
"description": "Denies the upsert_model command without any pre-configured scope.",
"type": "string",
"const": "yaak-models:deny-upsert-model"
},
{
"description": "Default permissions for the plugin",
"type": "string",

92
src-tauri/src/lib.rs
View File

@@ -33,11 +33,11 @@ use yaak_grpc::{deserialize_message, serialize_message, Code, ServiceDefinition}
use yaak_models::models::{
CookieJar, Environment, EnvironmentVariable, Folder, GrpcConnection, GrpcConnectionState,
GrpcEvent, GrpcEventType, GrpcRequest, HttpRequest, HttpResponse, HttpResponseState, KeyValue,
ModelType, Plugin, Settings, WebsocketRequest, Workspace, WorkspaceMeta,
Plugin, Settings, WebsocketRequest, Workspace, WorkspaceMeta,
};
use yaak_models::query_manager::QueryManagerExt;
use yaak_models::util::{
generate_model_id, get_workspace_export_resources, BatchUpsertResult, UpdateSource,
get_workspace_export_resources, maybe_gen_id, maybe_gen_id_opt, BatchUpsertResult, UpdateSource,
};
use yaak_plugins::events::{
BootResponse, CallHttpAuthenticationRequest, CallHttpRequestActionRequest, FilterResponse,
@@ -792,39 +792,13 @@ async fn cmd_import_data<R: Runtime>(
let mut id_map: BTreeMap<String, String> = BTreeMap::new();
fn maybe_gen_id(id: &str, model: ModelType, ids: &mut BTreeMap<String, String>) -> String {
if !id.starts_with("GENERATE_ID::") {
return id.to_string();
}
let unique_key = id.replace("GENERATE_ID", "");
if let Some(existing) = ids.get(unique_key.as_str()) {
existing.to_string()
} else {
let new_id = generate_model_id(model);
ids.insert(unique_key, new_id.clone());
new_id
}
}
fn maybe_gen_id_opt(
id: Option<String>,
model: ModelType,
ids: &mut BTreeMap<String, String>,
) -> Option<String> {
match id {
Some(id) => Some(maybe_gen_id(id.as_str(), model, ids)),
None => None,
}
}
let resources = import_result.resources;
let workspaces: Vec<Workspace> = resources
.workspaces
.into_iter()
.map(|mut v| {
v.id = maybe_gen_id(v.id.as_str(), ModelType::TypeWorkspace, &mut id_map);
v.id = maybe_gen_id::<Workspace>(v.id.as_str(), &mut id_map);
v
})
.collect();
@@ -833,11 +807,9 @@ async fn cmd_import_data<R: Runtime>(
.environments
.into_iter()
.map(|mut v| {
v.id = maybe_gen_id(v.id.as_str(), ModelType::TypeEnvironment, &mut id_map);
v.workspace_id =
maybe_gen_id(v.workspace_id.as_str(), ModelType::TypeWorkspace, &mut id_map);
v.environment_id =
maybe_gen_id_opt(v.environment_id, ModelType::TypeEnvironment, &mut id_map);
v.id = maybe_gen_id::<Environment>(v.id.as_str(), &mut id_map);
v.workspace_id = maybe_gen_id::<Workspace>(v.workspace_id.as_str(), &mut id_map);
v.environment_id = maybe_gen_id_opt::<Environment>(v.environment_id, &mut id_map);
v
})
.collect();
@@ -846,10 +818,9 @@ async fn cmd_import_data<R: Runtime>(
.folders
.into_iter()
.map(|mut v| {
v.id = maybe_gen_id(v.id.as_str(), ModelType::TypeFolder, &mut id_map);
v.workspace_id =
maybe_gen_id(v.workspace_id.as_str(), ModelType::TypeWorkspace, &mut id_map);
v.folder_id = maybe_gen_id_opt(v.folder_id, ModelType::TypeFolder, &mut id_map);
v.id = maybe_gen_id::<Folder>(v.id.as_str(), &mut id_map);
v.workspace_id = maybe_gen_id::<Workspace>(v.workspace_id.as_str(), &mut id_map);
v.folder_id = maybe_gen_id_opt::<Folder>(v.folder_id, &mut id_map);
v
})
.collect();
@@ -858,10 +829,9 @@ async fn cmd_import_data<R: Runtime>(
.http_requests
.into_iter()
.map(|mut v| {
v.id = maybe_gen_id(v.id.as_str(), ModelType::TypeHttpRequest, &mut id_map);
v.workspace_id =
maybe_gen_id(v.workspace_id.as_str(), ModelType::TypeWorkspace, &mut id_map);
v.folder_id = maybe_gen_id_opt(v.folder_id, ModelType::TypeFolder, &mut id_map);
v.id = maybe_gen_id::<HttpRequest>(v.id.as_str(), &mut id_map);
v.workspace_id = maybe_gen_id::<Workspace>(v.workspace_id.as_str(), &mut id_map);
v.folder_id = maybe_gen_id_opt::<Folder>(v.folder_id, &mut id_map);
v
})
.collect();
@@ -870,10 +840,9 @@ async fn cmd_import_data<R: Runtime>(
.grpc_requests
.into_iter()
.map(|mut v| {
v.id = maybe_gen_id(v.id.as_str(), ModelType::TypeGrpcRequest, &mut id_map);
v.workspace_id =
maybe_gen_id(v.workspace_id.as_str(), ModelType::TypeWorkspace, &mut id_map);
v.folder_id = maybe_gen_id_opt(v.folder_id, ModelType::TypeFolder, &mut id_map);
v.id = maybe_gen_id::<GrpcRequest>(v.id.as_str(), &mut id_map);
v.workspace_id = maybe_gen_id::<Workspace>(v.workspace_id.as_str(), &mut id_map);
v.folder_id = maybe_gen_id_opt::<Folder>(v.folder_id, &mut id_map);
v
})
.collect();
@@ -882,10 +851,9 @@ async fn cmd_import_data<R: Runtime>(
.websocket_requests
.into_iter()
.map(|mut v| {
v.id = maybe_gen_id(v.id.as_str(), ModelType::TypeWebsocketRequest, &mut id_map);
v.workspace_id =
maybe_gen_id(v.workspace_id.as_str(), ModelType::TypeWorkspace, &mut id_map);
v.folder_id = maybe_gen_id_opt(v.folder_id, ModelType::TypeFolder, &mut id_map);
v.id = maybe_gen_id::<WebsocketRequest>(v.id.as_str(), &mut id_map);
v.workspace_id = maybe_gen_id::<Workspace>(v.workspace_id.as_str(), &mut id_map);
v.folder_id = maybe_gen_id_opt::<Folder>(v.folder_id, &mut id_map);
v
})
.collect();
@@ -1605,10 +1573,11 @@ async fn cmd_list_workspaces<R: Runtime>(
app_handle: AppHandle<R>,
window: WebviewWindow<R>,
) -> YaakResult<Vec<Workspace>> {
let queries = app_handle.db();
let workspaces = queries.find_all::<Workspace>()?;
let db = app_handle.db();
let mut workspaces = db.find_all::<Workspace>()?;
if workspaces.is_empty() {
let workspace = queries.upsert_workspace(
workspaces.push(db.upsert_workspace(
&Workspace {
name: "Yaak".to_string(),
setting_follow_redirects: true,
@@ -1616,11 +1585,10 @@ async fn cmd_list_workspaces<R: Runtime>(
..Default::default()
},
&UpdateSource::from_window(&window),
)?;
Ok(vec![workspace])
} else {
Ok(workspaces)
)?);
}
Ok(workspaces)
}
#[tauri::command]
@@ -1990,10 +1958,10 @@ fn workspace_id_from_window<R: Runtime>(window: &WebviewWindow<R>) -> Option<Str
}
}
async fn workspace_from_window<R: Runtime>(window: &WebviewWindow<R>) -> YaakResult<Workspace> {
fn workspace_from_window<R: Runtime>(window: &WebviewWindow<R>) -> Option<Workspace> {
match workspace_id_from_window(&window) {
None => Err(GenericError("Failed to get workspace ID from window".to_string())),
Some(id) => Ok(window.db().get_workspace(id.as_str())?),
None => None,
Some(id) => window.db().get_workspace(&id).ok(),
}
}
@@ -2003,7 +1971,7 @@ fn environment_id_from_window<R: Runtime>(window: &WebviewWindow<R>) -> Option<S
query_pairs.find(|(k, _v)| k == "environment_id").map(|(_k, v)| v.to_string())
}
async fn environment_from_window<R: Runtime>(window: &WebviewWindow<R>) -> Option<Environment> {
fn environment_from_window<R: Runtime>(window: &WebviewWindow<R>) -> Option<Environment> {
match environment_id_from_window(&window) {
None => None,
Some(id) => window.db().get_environment(&id).ok(),
@@ -2016,7 +1984,7 @@ fn cookie_jar_id_from_window<R: Runtime>(window: &WebviewWindow<R>) -> Option<St
query_pairs.find(|(k, _v)| k == "cookie_jar_id").map(|(_k, v)| v.to_string())
}
async fn cookie_jar_from_window<R: Runtime>(window: &WebviewWindow<R>) -> Option<CookieJar> {
fn cookie_jar_from_window<R: Runtime>(window: &WebviewWindow<R>) -> Option<CookieJar> {
match cookie_jar_id_from_window(&window) {
None => None,
Some(id) => window.db().get_cookie_jar(&id).ok(),

27
src-tauri/src/plugin_events.rs
View File

@@ -73,10 +73,9 @@ pub(crate) async fn handle_plugin_event<R: Runtime>(
let window = get_window_from_window_context(app_handle, &window_context)
.expect("Failed to find window for render http request");
let workspace = workspace_from_window(&window)
.await
.expect("Failed to get workspace_id from window URL");
let environment = environment_from_window(&window).await;
let workspace =
workspace_from_window(&window).expect("Failed to get workspace_id from window URL");
let environment = environment_from_window(&window);
let base_environment = app_handle
.db()
.get_base_environment(&workspace.id)
@@ -98,10 +97,9 @@ pub(crate) async fn handle_plugin_event<R: Runtime>(
let window = get_window_from_window_context(app_handle, &window_context)
.expect("Failed to find window for render");
let workspace = workspace_from_window(&window)
.await
.expect("Failed to get workspace_id from window URL");
let environment = environment_from_window(&window).await;
let workspace =
workspace_from_window(&window).expect("Failed to get workspace_id from window URL");
let environment = environment_from_window(&window);
let base_environment = app_handle
.db()
.get_base_environment(&workspace.id)
@@ -132,8 +130,6 @@ pub(crate) async fn handle_plugin_event<R: Runtime>(
None
}
InternalEventPayload::ReloadResponse(_) => {
let window = get_window_from_window_context(app_handle, &window_context)
.expect("Failed to find window for plugin reload");
let plugins = app_handle.db().list_plugins().unwrap();
for plugin in plugins {
if plugin.directory != plugin_handle.dir {
@@ -147,7 +143,7 @@ pub(crate) async fn handle_plugin_event<R: Runtime>(
app_handle.db().upsert_plugin(&new_plugin, &UpdateSource::Plugin).unwrap();
}
let toast_event = plugin_handle.build_event_to_send(
&WindowContext::from_window(&window),
&event.window_context,
&InternalEventPayload::ShowToastRequest(ShowToastRequest {
message: format!("Reloaded plugin {}", plugin_handle.dir),
icon: Some(Icon::Info),
@@ -162,11 +158,10 @@ pub(crate) async fn handle_plugin_event<R: Runtime>(
let window = get_window_from_window_context(app_handle, &window_context)
.expect("Failed to find window for sending HTTP request");
let mut http_request = req.http_request;
let workspace = workspace_from_window(&window)
.await
.expect("Failed to get workspace_id from window URL");
let cookie_jar = cookie_jar_from_window(&window).await;
let environment = environment_from_window(&window).await;
let workspace =
workspace_from_window(&window).expect("Failed to get workspace_id from window URL");
let cookie_jar = cookie_jar_from_window(&window);
let environment = environment_from_window(&window);
if http_request.workspace_id.is_empty() {
http_request.workspace_id = workspace.id;

7
src-tauri/yaak-models/index.ts
View File

@@ -1 +1,8 @@
import { invoke } from '@tauri-apps/api/core';
import type { AnyModel } from './bindings/gen_models';
export * from './bindings/gen_models';
export async function upsertAnyModel(model: AnyModel): Promise<String> {
return invoke<String>('plugin:yaak-models|upsert', { model });
}

13
src-tauri/yaak-models/permissions/autogenerated/commands/delete_model.toml
View File

@@ -1,13 +0,0 @@
# Automatically generated - DO NOT EDIT!
"$schema" = "../../schemas/schema.json"
[[permission]]
identifier = "allow-delete-model"
description = "Enables the delete_model command without any pre-configured scope."
commands.allow = ["delete_model"]
[[permission]]
identifier = "deny-delete-model"
description = "Denies the delete_model command without any pre-configured scope."
commands.deny = ["delete_model"]

13
src-tauri/yaak-models/permissions/autogenerated/commands/upsert_model.toml
View File

@@ -1,13 +0,0 @@
# Automatically generated - DO NOT EDIT!
"$schema" = "../../schemas/schema.json"
[[permission]]
identifier = "allow-upsert-model"
description = "Enables the upsert_model command without any pre-configured scope."
commands.allow = ["upsert_model"]
[[permission]]
identifier = "deny-upsert-model"
description = "Denies the upsert_model command without any pre-configured scope."
commands.deny = ["upsert_model"]

52
src-tauri/yaak-models/permissions/autogenerated/reference.md
View File

@@ -43,32 +43,6 @@ Denies the delete command without any pre-configured scope.
<tr>
<td>
`yaak-models:allow-delete-model`
</td>
<td>
Enables the delete_model command without any pre-configured scope.
</td>
</tr>
<tr>
<td>
`yaak-models:deny-delete-model`
</td>
<td>
Denies the delete_model command without any pre-configured scope.
</td>
</tr>
<tr>
<td>
`yaak-models:allow-upsert`
</td>
@@ -89,32 +63,6 @@ Enables the upsert command without any pre-configured scope.
Denies the upsert command without any pre-configured scope.
</td>
</tr>
<tr>
<td>
`yaak-models:allow-upsert-model`
</td>
<td>
Enables the upsert_model command without any pre-configured scope.
</td>
</tr>
<tr>
<td>
`yaak-models:deny-upsert-model`
</td>
<td>
Denies the upsert_model command without any pre-configured scope.
</td>
</tr>
</table>

20
src-tauri/yaak-models/permissions/schemas/schema.json
View File

@@ -304,16 +304,6 @@
"type": "string",
"const": "deny-delete"
},
{
"description": "Enables the delete_model command without any pre-configured scope.",
"type": "string",
"const": "allow-delete-model"
},
{
"description": "Denies the delete_model command without any pre-configured scope.",
"type": "string",
"const": "deny-delete-model"
},
{
"description": "Enables the upsert command without any pre-configured scope.",
"type": "string",
@@ -324,16 +314,6 @@
"type": "string",
"const": "deny-upsert"
},
{
"description": "Enables the upsert_model command without any pre-configured scope.",
"type": "string",
"const": "allow-upsert-model"
},
{
"description": "Denies the upsert_model command without any pre-configured scope.",
"type": "string",
"const": "deny-upsert-model"
},
{
"description": "Default permissions for the plugin",
"type": "string",

40
src-tauri/yaak-models/src/commands.rs
View File

@@ -1,6 +1,7 @@
use crate::error::Error::GenericError;
use crate::error::Result;
use crate::query_manager::QueryManagerExt;
use crate::models::AnyModel;
use crate::query_manager::QueryManagerExt;
use crate::util::UpdateSource;
use tauri::{Runtime, WebviewWindow};
@@ -9,15 +10,44 @@ pub(crate) async fn upsert<R: Runtime>(
window: WebviewWindow<R>,
model: AnyModel,
) -> Result<String> {
let db = window.db();
let source = &UpdateSource::from_window(&window);
let id = match model {
AnyModel::HttpRequest(r) => window.db().upsert(&r, &UpdateSource::from_window(&window))?.id,
_ => todo!(),
AnyModel::HttpRequest(m) => db.upsert_http_request(&m, source)?.id,
AnyModel::CookieJar(m) => db.upsert_cookie_jar(&m, source)?.id,
AnyModel::Environment(m) => db.upsert_environment(&m, source)?.id,
AnyModel::Folder(m) => db.upsert_folder(&m, source)?.id,
AnyModel::GrpcRequest(m) => db.upsert_grpc_request(&m, source)?.id,
AnyModel::HttpResponse(m) => db.upsert_http_response(&m, source)?.id,
AnyModel::Plugin(m) => db.upsert_plugin(&m, source)?.id,
AnyModel::Settings(m) => db.upsert_settings(&m, source)?.id,
AnyModel::WebsocketRequest(m) => db.upsert_websocket_request(&m, source)?.id,
AnyModel::Workspace(m) => db.upsert_workspace(&m, source)?.id,
AnyModel::WorkspaceMeta(m) => db.upsert_workspace_meta(&m, source)?.id,
a => return Err(GenericError(format!("Cannot upsert AnyModel {a:?})"))),
};
Ok(id)
}
#[tauri::command]
pub(crate) fn delete() -> Result<()> {
Ok(())
pub(crate) fn delete<R: Runtime>(window: WebviewWindow<R>, model: AnyModel) -> Result<String> {
let db = window.db();
let source = &UpdateSource::from_window(&window);
let id = match model {
AnyModel::HttpRequest(m) => db.delete_http_request(&m, source)?.id,
AnyModel::CookieJar(m) => db.delete_cookie_jar(&m, source)?.id,
AnyModel::Environment(m) => db.delete_environment(&m, source)?.id,
AnyModel::Folder(m) => db.delete_folder(&m, source)?.id,
AnyModel::GrpcConnection(m) => db.delete_grpc_connection(&m, source)?.id,
AnyModel::GrpcRequest(m) => db.delete_grpc_request(&m, source)?.id,
AnyModel::HttpResponse(m) => db.delete_http_response(&m, source)?.id,
AnyModel::Plugin(m) => db.delete_plugin(&m, source)?.id,
AnyModel::WebsocketConnection(m) => db.delete_websocket_connection(&m, source)?.id,
AnyModel::WebsocketRequest(m) => db.delete_websocket_request(&m, source)?.id,
AnyModel::Workspace(m) => db.delete_workspace(&m, source)?.id,
a => return Err(GenericError(format!("Cannot delete AnyModel {a:?})"))),
};
Ok(id)
}

9
src-tauri/yaak-models/src/db_context.rs
View File

@@ -1,7 +1,7 @@
use crate::connection_or_tx::ConnectionOrTx;
use crate::error::Error::RowNotFound;
use crate::models::{AnyModel, ModelType, UpsertModelInfo};
use crate::util::{generate_model_id, ModelChangeEvent, ModelPayload, UpdateSource};
use crate::models::{AnyModel, UpsertModelInfo};
use crate::util::{ModelChangeEvent, ModelPayload, UpdateSource};
use rusqlite::OptionalExtension;
use sea_query::{
Asterisk, Expr, IntoColumnRef, IntoIden, IntoTableRef, OnConflict, Query, SimpleExpr,
@@ -100,7 +100,6 @@ impl<'a> DbContext<'a> {
M::table_name(),
M::id_column(),
model.get_id().as_str(),
|| generate_model_id(ModelType::TypeEnvironment),
model.clone().insert_values(source)?,
M::update_columns(),
source,
@@ -112,7 +111,6 @@ impl<'a> DbContext<'a> {
table: impl IntoTableRef,
id_col: impl IntoIden + Eq + Clone,
id_val: &str,
gen_id: fn() -> String,
other_values: Vec<(impl IntoIden + Eq, impl Into<SimpleExpr>)>,
update_columns: Vec<impl IntoIden>,
source: &UpdateSource,
@@ -122,7 +120,8 @@ impl<'a> DbContext<'a> {
{
let id_iden = id_col.into_iden();
let mut column_vec = vec![id_iden.clone()];
let mut value_vec = vec![if id_val == "" { gen_id().into() } else { id_val.into() }];
let mut value_vec =
vec![if id_val == "" { M::generate_id().into() } else { id_val.into() }];
for (col, val) in other_values {
value_vec.push(val.into());

2
src-tauri/yaak-models/src/lib.rs
View File

@@ -37,7 +37,7 @@ impl SqliteConnection {
}
pub fn init<R: Runtime>() -> TauriPlugin<R> {
tauri::plugin::Builder::new("yaak_models")
tauri::plugin::Builder::new("yaak-models")
.invoke_handler(generate_handler![upsert, delete])
.setup(|app_handle, _api| {
let app_path = app_handle.path().app_data_dir().unwrap();

145
src-tauri/yaak-models/src/models.rs
View File

@@ -3,7 +3,7 @@ use crate::models::HttpRequestIden::{
Authentication, AuthenticationType, Body, BodyType, CreatedAt, Description, FolderId, Headers,
Method, Name, SortPriority, UpdatedAt, Url, UrlParameters, WorkspaceId,
};
use crate::util::UpdateSource;
use crate::util::{generate_prefixed_id, UpdateSource};
use chrono::{NaiveDateTime, Utc};
use rusqlite::Row;
use sea_query::{enum_def, IntoIden, IntoTableRef, SimpleExpr};
@@ -121,6 +121,10 @@ impl UpsertModelInfo for Settings {
SettingsIden::Id
}
fn generate_id() -> String {
panic!("Settings does not have unique IDs")
}
fn get_id(&self) -> String {
self.id.clone()
}
@@ -227,6 +231,10 @@ impl UpsertModelInfo for Workspace {
WorkspaceIden::Id
}
fn generate_id() -> String {
generate_prefixed_id("wk")
}
fn get_id(&self) -> String {
self.id.clone()
}
@@ -312,6 +320,10 @@ impl UpsertModelInfo for WorkspaceMeta {
WorkspaceMetaIden::Id
}
fn generate_id() -> String {
generate_prefixed_id("wm")
}
fn get_id(&self) -> String {
self.id.clone()
}
@@ -401,6 +413,10 @@ impl UpsertModelInfo for CookieJar {
CookieJarIden::Id
}
fn generate_id() -> String {
generate_prefixed_id("cj")
}
fn get_id(&self) -> String {
self.id.clone()
}
@@ -470,6 +486,10 @@ impl UpsertModelInfo for Environment {
EnvironmentIden::Id
}
fn generate_id() -> String {
generate_prefixed_id("ev")
}
fn get_id(&self) -> String {
self.id.clone()
}
@@ -555,6 +575,10 @@ impl UpsertModelInfo for Folder {
FolderIden::Id
}
fn generate_id() -> String {
generate_prefixed_id("fl")
}
fn get_id(&self) -> String {
self.id.clone()
}
@@ -667,6 +691,10 @@ impl UpsertModelInfo for HttpRequest {
HttpRequestIden::Id
}
fn generate_id() -> String {
generate_prefixed_id("rq")
}
fn get_id(&self) -> String {
self.id.to_string()
}
@@ -786,6 +814,10 @@ impl UpsertModelInfo for WebsocketConnection {
WebsocketConnectionIden::Id
}
fn generate_id() -> String {
generate_prefixed_id("wc")
}
fn get_id(&self) -> String {
self.id.clone()
}
@@ -892,6 +924,10 @@ impl UpsertModelInfo for WebsocketRequest {
WebsocketRequestIden::Id
}
fn generate_id() -> String {
generate_prefixed_id("wr")
}
fn get_id(&self) -> String {
self.id.clone()
}
@@ -1009,6 +1045,10 @@ impl UpsertModelInfo for WebsocketEvent {
WebsocketEventIden::Id
}
fn generate_id() -> String {
generate_prefixed_id("we")
}
fn get_id(&self) -> String {
self.id.clone()
}
@@ -1118,6 +1158,10 @@ impl UpsertModelInfo for HttpResponse {
HttpResponseIden::Id
}
fn generate_id() -> String {
generate_prefixed_id("rs")
}
fn get_id(&self) -> String {
self.id.clone()
}
@@ -1242,6 +1286,10 @@ impl UpsertModelInfo for GrpcRequest {
GrpcRequestIden::Id
}
fn generate_id() -> String {
generate_prefixed_id("gr")
}
fn get_id(&self) -> String {
self.id.clone()
}
@@ -1361,6 +1409,10 @@ impl UpsertModelInfo for GrpcConnection {
GrpcConnectionIden::Id
}
fn generate_id() -> String {
generate_prefixed_id("gc")
}
fn get_id(&self) -> String {
self.id.clone()
}
@@ -1473,6 +1525,10 @@ impl UpsertModelInfo for GrpcEvent {
GrpcEventIden::Id
}
fn generate_id() -> String {
generate_prefixed_id("ge")
}
fn get_id(&self) -> String {
self.id.clone()
}
@@ -1556,6 +1612,10 @@ impl UpsertModelInfo for Plugin {
PluginIden::Id
}
fn generate_id() -> String {
generate_prefixed_id("pg")
}
fn get_id(&self) -> String {
self.id.clone()
}
@@ -1630,6 +1690,10 @@ impl UpsertModelInfo for SyncState {
SyncStateIden::Id
}
fn generate_id() -> String {
generate_prefixed_id("ss")
}
fn get_id(&self) -> String {
self.id.clone()
}
@@ -1748,47 +1812,6 @@ fn default_http_method() -> String {
"GET".to_string()
}
pub enum ModelType {
TypeCookieJar,
TypeEnvironment,
TypeFolder,
TypeGrpcConnection,
TypeGrpcEvent,
TypeGrpcRequest,
TypeHttpRequest,
TypeHttpResponse,
TypePlugin,
TypeSyncState,
TypeWebSocketConnection,
TypeWebSocketEvent,
TypeWebsocketRequest,
TypeWorkspace,
TypeWorkspaceMeta,
}
impl ModelType {
pub fn id_prefix(&self) -> String {
match self {
ModelType::TypeCookieJar => "cj",
ModelType::TypeEnvironment => "ev",
ModelType::TypeFolder => "fl",
ModelType::TypeGrpcConnection => "gc",
ModelType::TypeGrpcEvent => "ge",
ModelType::TypeGrpcRequest => "gr",
ModelType::TypeHttpRequest => "rq",
ModelType::TypeHttpResponse => "rs",
ModelType::TypePlugin => "pg",
ModelType::TypeWorkspace => "wk",
ModelType::TypeWorkspaceMeta => "wm",
ModelType::TypeSyncState => "ss",
ModelType::TypeWebSocketConnection => "wc",
ModelType::TypeWebSocketEvent => "we",
ModelType::TypeWebsocketRequest => "wr",
}
.to_string()
}
}
#[macro_export]
macro_rules! define_any_model {
($($type:ident),* $(,)?) => {
@@ -1850,34 +1873,19 @@ impl<'de> Deserialize<'de> for AnyModel {
{
let value = Value::deserialize(deserializer)?;
let model = value.as_object().unwrap();
use serde_json::from_value as fv;
let model = match model.get("model") {
Some(m) if m == "http_request" => {
AnyModel::HttpRequest(serde_json::from_value(value).unwrap())
}
Some(m) if m == "grpc_request" => {
AnyModel::GrpcRequest(serde_json::from_value(value).unwrap())
}
Some(m) if m == "workspace" => {
AnyModel::Workspace(serde_json::from_value(value).unwrap())
}
Some(m) if m == "environment" => {
AnyModel::Environment(serde_json::from_value(value).unwrap())
}
Some(m) if m == "folder" => AnyModel::Folder(serde_json::from_value(value).unwrap()),
Some(m) if m == "key_value" => {
AnyModel::KeyValue(serde_json::from_value(value).unwrap())
}
Some(m) if m == "grpc_connection" => {
AnyModel::GrpcConnection(serde_json::from_value(value).unwrap())
}
Some(m) if m == "grpc_event" => {
AnyModel::GrpcEvent(serde_json::from_value(value).unwrap())
}
Some(m) if m == "cookie_jar" => {
AnyModel::CookieJar(serde_json::from_value(value).unwrap())
}
Some(m) if m == "plugin" => AnyModel::Plugin(serde_json::from_value(value).unwrap()),
Some(m) if m == "http_request" => AnyModel::HttpRequest(fv(value).unwrap()),
Some(m) if m == "grpc_request" => AnyModel::GrpcRequest(fv(value).unwrap()),
Some(m) if m == "workspace" => AnyModel::Workspace(fv(value).unwrap()),
Some(m) if m == "environment" => AnyModel::Environment(fv(value).unwrap()),
Some(m) if m == "folder" => AnyModel::Folder(fv(value).unwrap()),
Some(m) if m == "key_value" => AnyModel::KeyValue(fv(value).unwrap()),
Some(m) if m == "grpc_connection" => AnyModel::GrpcConnection(fv(value).unwrap()),
Some(m) if m == "grpc_event" => AnyModel::GrpcEvent(fv(value).unwrap()),
Some(m) if m == "cookie_jar" => AnyModel::CookieJar(fv(value).unwrap()),
Some(m) if m == "plugin" => AnyModel::Plugin(fv(value).unwrap()),
Some(m) => {
return Err(serde::de::Error::custom(format!("Unknown model {}", m)));
}
@@ -1920,6 +1928,7 @@ impl AnyModel {
pub trait UpsertModelInfo {
fn table_name() -> impl IntoTableRef;
fn id_column() -> impl IntoIden + Eq + Clone;
fn generate_id() -> String;
fn get_id(&self) -> String;
fn insert_values(
self,

43
src-tauri/yaak-models/src/queries/key_values.rs
View File

@@ -1,3 +1,4 @@
use crate::db_context::DbContext;
use crate::error::Result;
use crate::models::{KeyValue, KeyValueIden};
use crate::util::{ModelChangeEvent, ModelPayload, UpdateSource};
@@ -5,7 +6,6 @@ use log::error;
use sea_query::Keyword::CurrentTimestamp;
use sea_query::{Asterisk, Cond, Expr, OnConflict, Query, SqliteQueryBuilder};
use sea_query_rusqlite::RusqliteBinder;
use crate::db_context::DbContext;
impl<'a> DbContext<'a> {
pub fn list_key_values_raw(&self) -> Result<Vec<KeyValue>> {
@@ -92,8 +92,39 @@ impl<'a> DbContext<'a> {
value: &str,
source: &UpdateSource,
) -> (KeyValue, bool) {
let existing = self.get_key_value_raw(namespace, key);
match self.get_key_value_raw(namespace, key) {
None => (
self.upsert_key_value(
&KeyValue {
namespace: namespace.to_string(),
key: key.to_string(),
value: value.to_string(),
..Default::default()
},
source,
)
.expect("Failed to create key value"),
true,
),
Some(kv) => (
self.upsert_key_value(
&KeyValue {
value: value.to_string(),
..kv
},
source,
)
.expect("Failed to update key value"),
false,
),
}
}
pub fn upsert_key_value(
&self,
key_value: &KeyValue,
source: &UpdateSource,
) -> Result<KeyValue> {
let (sql, params) = Query::insert()
.into_table(KeyValueIden::Table)
.columns([
@@ -106,9 +137,9 @@ impl<'a> DbContext<'a> {
.values_panic([
CurrentTimestamp.into(),
CurrentTimestamp.into(),
namespace.into(),
key.into(),
value.into(),
key_value.namespace.clone().into(),
key_value.key.clone().into(),
key_value.value.clone().into(),
])
.on_conflict(
OnConflict::new()
@@ -130,7 +161,7 @@ impl<'a> DbContext<'a> {
};
self.tx.try_send(payload).unwrap();
(m, existing.is_none())
Ok(m)
}
pub fn delete_key_value(

38
src-tauri/yaak-models/src/util.rs
View File

@@ -1,19 +1,16 @@
use std::collections::BTreeMap;
use crate::error::Result;
use crate::models::{
AnyModel, Environment, Folder, GrpcRequest, HttpRequest, ModelType, WebsocketRequest,
Workspace, WorkspaceIden,
};
use crate::models::{AnyModel, Environment, Folder, GrpcRequest, HttpRequest, UpsertModelInfo, WebsocketRequest, Workspace, WorkspaceIden};
use crate::query_manager::QueryManagerExt;
use chrono::{NaiveDateTime, Utc};
use log::warn;
use nanoid::nanoid;
use serde::{Deserialize, Serialize};
use tauri::{AppHandle, Listener, Runtime, WebviewWindow};
use ts_rs::TS;
use crate::query_manager::QueryManagerExt;
pub fn generate_model_id(model: ModelType) -> String {
let id = generate_id();
format!("{}_{}", model.id_prefix(), id)
pub fn generate_prefixed_id(prefix: &str) -> String {
format!("{prefix}_{}", generate_id())
}
pub fn generate_id() -> String {
@@ -151,3 +148,28 @@ pub async fn get_workspace_export_resources<R: Runtime>(
Ok(data)
}
pub fn maybe_gen_id<M: UpsertModelInfo>(id: &str, ids: &mut BTreeMap<String, String>) -> String {
if !id.starts_with("GENERATE_ID::") {
return id.to_string();
}
let unique_key = id.replace("GENERATE_ID", "");
if let Some(existing) = ids.get(unique_key.as_str()) {
existing.to_string()
} else {
let new_id = M::generate_id();
ids.insert(unique_key, new_id.clone());
new_id
}
}
pub fn maybe_gen_id_opt<M: UpsertModelInfo>(
id: Option<String>,
ids: &mut BTreeMap<String, String>,
) -> Option<String> {
match id {
Some(id) => Some(maybe_gen_id::<M>(id.as_str(), ids)),
None => None,
}
}