mirror of
https://github.com/mountain-loop/yaak.git
synced 2026-04-14 12:59:42 +02:00
Compare commits
13 Commits
v2026.2.0-
...
mcp-client
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
c415e7f471 | ||
|
|
8023603ebe | ||
|
|
66942eaf2c | ||
|
|
38796b1833 | ||
|
|
49ffa6fc45 | ||
|
|
1f56ba2eb6 | ||
|
|
f98a70ecb4 | ||
|
|
2984eb40c9 | ||
|
|
cc5d4742f0 | ||
|
|
5b8e4b98a0 | ||
|
|
8637c90a21 | ||
|
|
b88c5e71a0 | ||
|
|
1899d512ab |
36
Cargo.lock
generated
36
Cargo.lock
generated
@@ -689,9 +689,9 @@ checksum = "8f1fe948ff07f4bd06c30984e69f5b4899c516a3ef74f34df92a2df2ab535495"
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "bytes"
|
name = "bytes"
|
||||||
version = "1.10.1"
|
version = "1.11.1"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "d71b6127be86fdcfddb610f7182ac57211d4b18a3e9c82eb2d17662f2227ad6a"
|
checksum = "1e748733b7cbc798e1434b6ac524f0c1ff2ab456fe201501e6497c8417a4fc33"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"serde",
|
"serde",
|
||||||
]
|
]
|
||||||
@@ -1316,12 +1316,12 @@ checksum = "da692b8d1080ea3045efaab14434d40468c3d8657e42abddfffca87b428f4c1b"
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "deranged"
|
name = "deranged"
|
||||||
version = "0.4.0"
|
version = "0.5.5"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "9c9e6a11ca8224451684bc0d7d5a7adbf8f2fd6887261a1cfc3c0432f9d4068e"
|
checksum = "ececcb659e7ba858fb4f10388c250a7252eb0a27373f1a72b8748afdd248e587"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"powerfmt",
|
"powerfmt",
|
||||||
"serde",
|
"serde_core",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@@ -2136,9 +2136,9 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "git2"
|
name = "git2"
|
||||||
version = "0.20.2"
|
version = "0.20.4"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "2deb07a133b1520dc1a5690e9bd08950108873d7ed5de38dcc74d3b5ebffa110"
|
checksum = "7b88256088d75a56f8ecfa070513a775dd9107f6530ef14919dac831af9cfe2b"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"bitflags 2.9.1",
|
"bitflags 2.9.1",
|
||||||
"libc",
|
"libc",
|
||||||
@@ -3036,9 +3036,9 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "libgit2-sys"
|
name = "libgit2-sys"
|
||||||
version = "0.18.1+1.9.0"
|
version = "0.18.3+1.9.2"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "e1dcb20f84ffcdd825c7a311ae347cce604a6f084a767dec4a4929829645290e"
|
checksum = "c9b3acc4b91781bb0b3386669d325163746af5f6e4f73e6d2d630e09a35f3487"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"cc",
|
"cc",
|
||||||
"libc",
|
"libc",
|
||||||
@@ -3446,9 +3446,9 @@ checksum = "5e0826a989adedc2a244799e823aece04662b66609d96af8dff7ac6df9a8925d"
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "num-conv"
|
name = "num-conv"
|
||||||
version = "0.1.0"
|
version = "0.2.0"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9"
|
checksum = "cf97ec579c3c42f953ef76dbf8d55ac91fb219dde70e49aa4a6b7d74e9919050"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "num-traits"
|
name = "num-traits"
|
||||||
@@ -6341,9 +6341,9 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "time"
|
name = "time"
|
||||||
version = "0.3.41"
|
version = "0.3.47"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "8a7619e19bc266e0f9c5e6686659d394bc57973859340060a69221e57dbc0c40"
|
checksum = "743bd48c283afc0388f9b8827b976905fb217ad9e647fae3a379a9283c4def2c"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"deranged",
|
"deranged",
|
||||||
"itoa",
|
"itoa",
|
||||||
@@ -6351,22 +6351,22 @@ dependencies = [
|
|||||||
"num-conv",
|
"num-conv",
|
||||||
"num_threads",
|
"num_threads",
|
||||||
"powerfmt",
|
"powerfmt",
|
||||||
"serde",
|
"serde_core",
|
||||||
"time-core",
|
"time-core",
|
||||||
"time-macros",
|
"time-macros",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "time-core"
|
name = "time-core"
|
||||||
version = "0.1.4"
|
version = "0.1.8"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "c9e9a38711f559d9e3ce1cdb06dd7c5b8ea546bc90052da6d06bb76da74bb07c"
|
checksum = "7694e1cfe791f8d31026952abf09c69ca6f6fa4e1a1229e18988f06a04a12dca"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "time-macros"
|
name = "time-macros"
|
||||||
version = "0.2.22"
|
version = "0.2.27"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "3526739392ec93fd8b359c8e98514cb3e8e021beb4e5f597b00a0221f8ed8a49"
|
checksum = "2e70e4c5a0e0a8a4823ad65dfe1a6930e4f4d756dcd9dd7939022b5e8c501215"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"num-conv",
|
"num-conv",
|
||||||
"time-core",
|
"time-core",
|
||||||
|
|||||||
27
MCP_CLIENT_PLAN.md
Normal file
27
MCP_CLIENT_PLAN.md
Normal file
@@ -0,0 +1,27 @@
|
|||||||
|
# MCP Client Plan
|
||||||
|
|
||||||
|
## Goal
|
||||||
|
Add an MCP client mode to Yaak so users can connect to and debug MCP servers.
|
||||||
|
|
||||||
|
## Core Design
|
||||||
|
- **Protocol layer:** Implement JSON‑RPC framing, message IDs, and notifications as the common core.
|
||||||
|
- **Transport interface:** Define an async trait with `connect`, `send`, `receive`, and `close` methods.
|
||||||
|
- **Transports:**
|
||||||
|
- Start with **Standard I/O** for local development.
|
||||||
|
- Reuse the existing HTTP stack for **HTTP streaming** next.
|
||||||
|
- Leave hooks for **WebSocket** support later.
|
||||||
|
|
||||||
|
## Integration
|
||||||
|
- Register MCP as a new request type alongside REST, GraphQL, gRPC, and WebSocket.
|
||||||
|
- Allow per‑request transport selection (stdio or HTTP).
|
||||||
|
- Map inbound messages into a new MCP response model that feeds existing timeline and debug views.
|
||||||
|
|
||||||
|
## Testing and Dog‑fooding
|
||||||
|
- Convert Yaak's own MCP server to Standard I/O for local testing.
|
||||||
|
- Use it internally to validate protocol behavior and message flow.
|
||||||
|
- Add unit and integration tests for JSON‑RPC messaging and transport abstractions.
|
||||||
|
|
||||||
|
## Future Refinements
|
||||||
|
- Add WebSocket transport support once core paths are stable.
|
||||||
|
- Extend timelines for protocol‑level visualization layered over raw transport events.
|
||||||
|
- Implement version and capability negotiation between client and server.
|
||||||
198
crates-cli/yaak-cli/PLAN.md
Normal file
198
crates-cli/yaak-cli/PLAN.md
Normal file
@@ -0,0 +1,198 @@
|
|||||||
|
# CLI Command Architecture Plan
|
||||||
|
|
||||||
|
## Goal
|
||||||
|
|
||||||
|
Redesign the yaak-cli command structure to use a resource-oriented `<resource> <action>`
|
||||||
|
pattern that scales well, is discoverable, and supports both human and LLM workflows.
|
||||||
|
|
||||||
|
## Command Architecture
|
||||||
|
|
||||||
|
### Design Principles
|
||||||
|
|
||||||
|
- **Resource-oriented**: top-level commands are nouns, subcommands are verbs
|
||||||
|
- **Polymorphic requests**: `request` covers HTTP, gRPC, and WebSocket — the CLI
|
||||||
|
resolves the type via `get_any_request` and adapts behavior accordingly
|
||||||
|
- **Simple creation, full-fidelity via JSON**: human-friendly flags for basic creation,
|
||||||
|
`--json` for full control (targeted at LLM and scripting workflows)
|
||||||
|
- **Runtime schema introspection**: `request schema` outputs JSON Schema for the request
|
||||||
|
models, with dynamic auth fields populated from loaded plugins at runtime
|
||||||
|
- **Destructive actions require confirmation**: `delete` commands prompt for user
|
||||||
|
confirmation before proceeding. Can be bypassed with `--yes` / `-y` for scripting
|
||||||
|
|
||||||
|
### Commands
|
||||||
|
|
||||||
|
```
|
||||||
|
# Top-level shortcut
|
||||||
|
yaakcli send <id> [-e <env_id>] # id can be a request, folder, or workspace
|
||||||
|
|
||||||
|
# Resource commands
|
||||||
|
yaakcli workspace list
|
||||||
|
yaakcli workspace show <id>
|
||||||
|
yaakcli workspace create --name <name>
|
||||||
|
yaakcli workspace create --json '{"name": "My Workspace"}'
|
||||||
|
yaakcli workspace create '{"name": "My Workspace"}' # positional JSON shorthand
|
||||||
|
yaakcli workspace update --json '{"id": "wk_abc", "name": "New Name"}'
|
||||||
|
yaakcli workspace delete <id>
|
||||||
|
|
||||||
|
yaakcli request list <workspace_id>
|
||||||
|
yaakcli request show <id>
|
||||||
|
yaakcli request create <workspace_id> --name <name> --url <url> [--method GET]
|
||||||
|
yaakcli request create --json '{"workspaceId": "wk_abc", "url": "..."}'
|
||||||
|
yaakcli request update --json '{"id": "rq_abc", "url": "https://new.com"}'
|
||||||
|
yaakcli request send <id> [-e <env_id>]
|
||||||
|
yaakcli request delete <id>
|
||||||
|
yaakcli request schema <http|grpc|websocket>
|
||||||
|
|
||||||
|
yaakcli folder list <workspace_id>
|
||||||
|
yaakcli folder show <id>
|
||||||
|
yaakcli folder create <workspace_id> --name <name>
|
||||||
|
yaakcli folder create --json '{"workspaceId": "wk_abc", "name": "Auth"}'
|
||||||
|
yaakcli folder update --json '{"id": "fl_abc", "name": "New Name"}'
|
||||||
|
yaakcli folder delete <id>
|
||||||
|
|
||||||
|
yaakcli environment list <workspace_id>
|
||||||
|
yaakcli environment show <id>
|
||||||
|
yaakcli environment create <workspace_id> --name <name>
|
||||||
|
yaakcli environment create --json '{"workspaceId": "wk_abc", "name": "Production"}'
|
||||||
|
yaakcli environment update --json '{"id": "ev_abc", ...}'
|
||||||
|
yaakcli environment delete <id>
|
||||||
|
|
||||||
|
```
|
||||||
|
|
||||||
|
### `send` — Top-Level Shortcut
|
||||||
|
|
||||||
|
`yaakcli send <id>` is a convenience alias that accepts any sendable ID. It tries
|
||||||
|
each type in order via DB lookups (short-circuiting on first match):
|
||||||
|
|
||||||
|
1. Request (HTTP, gRPC, or WebSocket via `get_any_request`)
|
||||||
|
2. Folder (sends all requests in the folder)
|
||||||
|
3. Workspace (sends all requests in the workspace)
|
||||||
|
|
||||||
|
ID prefixes exist (e.g. `rq_`, `fl_`, `wk_`) but are not relied upon — resolution
|
||||||
|
is purely by DB lookup.
|
||||||
|
|
||||||
|
`request send <id>` is the same but restricted to request IDs only.
|
||||||
|
|
||||||
|
### Request Send — Polymorphic Behavior
|
||||||
|
|
||||||
|
`send` means "execute this request" regardless of protocol:
|
||||||
|
|
||||||
|
- **HTTP**: send request, print response, exit
|
||||||
|
- **gRPC**: invoke the method; for streaming, stream output to stdout until done/Ctrl+C
|
||||||
|
- **WebSocket**: connect, stream messages to stdout until closed/Ctrl+C
|
||||||
|
|
||||||
|
### `request schema` — Runtime JSON Schema
|
||||||
|
|
||||||
|
Outputs a JSON Schema describing the full request shape, including dynamic fields:
|
||||||
|
|
||||||
|
1. Generate base schema from `schemars::JsonSchema` derive on the Rust model structs
|
||||||
|
2. Load plugins, collect auth strategy definitions and their form inputs
|
||||||
|
3. Merge plugin-defined auth fields into the `authentication` property as a `oneOf`
|
||||||
|
4. Output the combined schema as JSON
|
||||||
|
|
||||||
|
This lets an LLM call `schema`, read the shape, and construct valid JSON for
|
||||||
|
`create --json` or `update --json`.
|
||||||
|
|
||||||
|
## Implementation Steps
|
||||||
|
|
||||||
|
### Phase 1: Restructure commands (no new functionality)
|
||||||
|
|
||||||
|
Refactor `main.rs` into the new resource/action pattern using clap subcommand nesting.
|
||||||
|
Existing behavior stays the same, just reorganized. Remove the `get` command.
|
||||||
|
|
||||||
|
1. Create module structure: `commands/workspace.rs`, `commands/request.rs`, etc.
|
||||||
|
2. Define nested clap enums:
|
||||||
|
```rust
|
||||||
|
enum Commands {
|
||||||
|
Send(SendArgs),
|
||||||
|
Workspace(WorkspaceArgs),
|
||||||
|
Request(RequestArgs),
|
||||||
|
Folder(FolderArgs),
|
||||||
|
Environment(EnvironmentArgs),
|
||||||
|
}
|
||||||
|
```
|
||||||
|
3. Move existing `Workspaces` logic into `workspace list`
|
||||||
|
4. Move existing `Requests` logic into `request list`
|
||||||
|
5. Move existing `Send` logic into `request send`
|
||||||
|
6. Move existing `Create` logic into `request create`
|
||||||
|
7. Delete the `Get` command entirely
|
||||||
|
8. Extract shared setup (DB init, plugin init, encryption) into a reusable context struct
|
||||||
|
|
||||||
|
### Phase 2: Add missing CRUD commands
|
||||||
|
|
||||||
|
1. `workspace show <id>`
|
||||||
|
2. `workspace create --name <name>` (and `--json`)
|
||||||
|
3. `workspace update --json`
|
||||||
|
4. `workspace delete <id>`
|
||||||
|
5. `request show <id>` (JSON output of the full request model)
|
||||||
|
6. `request delete <id>`
|
||||||
|
7. `folder list <workspace_id>`
|
||||||
|
8. `folder show <id>`
|
||||||
|
9. `folder create <workspace_id> --name <name>` (and `--json`)
|
||||||
|
10. `folder update --json`
|
||||||
|
11. `folder delete <id>`
|
||||||
|
12. `environment list <workspace_id>`
|
||||||
|
13. `environment show <id>`
|
||||||
|
14. `environment create <workspace_id> --name <name>` (and `--json`)
|
||||||
|
15. `environment update --json`
|
||||||
|
16. `environment delete <id>`
|
||||||
|
|
||||||
|
### Phase 3: JSON input for create/update
|
||||||
|
|
||||||
|
Both commands accept JSON via `--json <string>` or as a positional argument (detected
|
||||||
|
by leading `{`). They follow the same upsert pattern as the plugin API.
|
||||||
|
|
||||||
|
- **`create --json`**: JSON must include `workspaceId`. Must NOT include `id` (or
|
||||||
|
use empty string `""`). Deserializes into the model with defaults for missing fields,
|
||||||
|
then upserts (insert).
|
||||||
|
- **`update --json`**: JSON must include `id`. Performs a fetch-merge-upsert:
|
||||||
|
1. Fetch the existing model from DB
|
||||||
|
2. Serialize it to `serde_json::Value`
|
||||||
|
3. Deep-merge the user's partial JSON on top (JSON Merge Patch / RFC 7386 semantics)
|
||||||
|
4. Deserialize back into the typed model
|
||||||
|
5. Upsert (update)
|
||||||
|
|
||||||
|
This matches how the MCP server plugin already does it (fetch existing, spread, override),
|
||||||
|
but the CLI handles the merge server-side so callers don't have to.
|
||||||
|
|
||||||
|
Setting a field to `null` removes it (for `Option<T>` fields), per RFC 7386.
|
||||||
|
|
||||||
|
Implementation:
|
||||||
|
1. Add `--json` flag and positional JSON detection to `create` commands
|
||||||
|
2. Add `update` commands with required `--json` flag
|
||||||
|
3. Implement JSON merge utility (or use `json-patch` crate)
|
||||||
|
|
||||||
|
### Phase 4: Runtime schema generation
|
||||||
|
|
||||||
|
1. Add `schemars` dependency to `yaak-models`
|
||||||
|
2. Derive `JsonSchema` on `HttpRequest`, `GrpcRequest`, `WebsocketRequest`, and their
|
||||||
|
nested types (`HttpRequestHeader`, `HttpUrlParameter`, etc.)
|
||||||
|
3. Implement `request schema` command:
|
||||||
|
- Generate base schema from schemars
|
||||||
|
- Query plugins for auth strategy form inputs
|
||||||
|
- Convert plugin form inputs into JSON Schema properties
|
||||||
|
- Merge into the `authentication` field
|
||||||
|
- Print to stdout
|
||||||
|
|
||||||
|
### Phase 5: Polymorphic send
|
||||||
|
|
||||||
|
1. Update `request send` to use `get_any_request` to resolve the request type
|
||||||
|
2. Match on `AnyRequest` variant and dispatch to the appropriate sender:
|
||||||
|
- `AnyRequest::HttpRequest` — existing HTTP send logic
|
||||||
|
- `AnyRequest::GrpcRequest` — gRPC invoke (future implementation)
|
||||||
|
- `AnyRequest::WebsocketRequest` — WebSocket connect (future implementation)
|
||||||
|
3. gRPC and WebSocket send can initially return "not yet implemented" errors
|
||||||
|
|
||||||
|
### Phase 6: Top-level `send` and folder/workspace send
|
||||||
|
|
||||||
|
1. Add top-level `yaakcli send <id>` command
|
||||||
|
2. Resolve ID by trying DB lookups in order: any_request → folder → workspace
|
||||||
|
3. For folder: list all requests in folder, send each
|
||||||
|
4. For workspace: list all requests in workspace, send each
|
||||||
|
5. Add execution options: `--sequential` (default), `--parallel`, `--fail-fast`
|
||||||
|
|
||||||
|
## Crate Changes
|
||||||
|
|
||||||
|
- **yaak-cli**: restructure into modules, new clap hierarchy
|
||||||
|
- **yaak-models**: add `schemars` dependency, derive `JsonSchema` on model structs
|
||||||
|
(current derives: `Debug, Clone, PartialEq, Serialize, Deserialize, Default, TS`)
|
||||||
@@ -12,7 +12,7 @@ use chrono::Utc;
|
|||||||
use cookie::Cookie;
|
use cookie::Cookie;
|
||||||
use log::error;
|
use log::error;
|
||||||
use std::sync::Arc;
|
use std::sync::Arc;
|
||||||
use tauri::{AppHandle, Emitter, Manager, Runtime};
|
use tauri::{AppHandle, Emitter, Listener, Manager, Runtime};
|
||||||
use tauri_plugin_clipboard_manager::ClipboardExt;
|
use tauri_plugin_clipboard_manager::ClipboardExt;
|
||||||
use tauri_plugin_opener::OpenerExt;
|
use tauri_plugin_opener::OpenerExt;
|
||||||
use yaak_crypto::manager::EncryptionManager;
|
use yaak_crypto::manager::EncryptionManager;
|
||||||
@@ -59,7 +59,55 @@ pub(crate) async fn handle_plugin_event<R: Runtime>(
|
|||||||
}
|
}
|
||||||
InternalEventPayload::PromptFormRequest(_) => {
|
InternalEventPayload::PromptFormRequest(_) => {
|
||||||
let window = get_window_from_plugin_context(app_handle, &plugin_context)?;
|
let window = get_window_from_plugin_context(app_handle, &plugin_context)?;
|
||||||
Ok(call_frontend(&window, event).await)
|
if event.reply_id.is_some() {
|
||||||
|
// Follow-up update from plugin runtime with resolved inputs — forward to frontend
|
||||||
|
window.emit_to(window.label(), "plugin_event", event.clone())?;
|
||||||
|
Ok(None)
|
||||||
|
} else {
|
||||||
|
// Initial request — set up bidirectional communication
|
||||||
|
window.emit_to(window.label(), "plugin_event", event.clone()).unwrap();
|
||||||
|
|
||||||
|
let event_id = event.id.clone();
|
||||||
|
let plugin_handle = plugin_handle.clone();
|
||||||
|
let plugin_context = plugin_context.clone();
|
||||||
|
let window = window.clone();
|
||||||
|
|
||||||
|
// Spawn async task to handle bidirectional form communication
|
||||||
|
tauri::async_runtime::spawn(async move {
|
||||||
|
let (tx, mut rx) = tokio::sync::mpsc::channel::<InternalEvent>(128);
|
||||||
|
|
||||||
|
// Listen for replies from the frontend
|
||||||
|
let listener_id = window.listen(event_id, move |ev: tauri::Event| {
|
||||||
|
let resp: InternalEvent = serde_json::from_str(ev.payload()).unwrap();
|
||||||
|
let _ = tx.try_send(resp);
|
||||||
|
});
|
||||||
|
|
||||||
|
// Forward each reply to the plugin runtime
|
||||||
|
while let Some(resp) = rx.recv().await {
|
||||||
|
let is_done = matches!(
|
||||||
|
&resp.payload,
|
||||||
|
InternalEventPayload::PromptFormResponse(r) if r.done.unwrap_or(false)
|
||||||
|
);
|
||||||
|
|
||||||
|
let event_to_send = plugin_handle.build_event_to_send(
|
||||||
|
&plugin_context,
|
||||||
|
&resp.payload,
|
||||||
|
Some(resp.reply_id.unwrap_or_default()),
|
||||||
|
);
|
||||||
|
if let Err(e) = plugin_handle.send(&event_to_send).await {
|
||||||
|
log::warn!("Failed to forward form response to plugin: {:?}", e);
|
||||||
|
}
|
||||||
|
|
||||||
|
if is_done {
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
window.unlisten(listener_id);
|
||||||
|
});
|
||||||
|
|
||||||
|
Ok(None)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
InternalEventPayload::FindHttpResponsesRequest(req) => {
|
InternalEventPayload::FindHttpResponsesRequest(req) => {
|
||||||
let http_responses = app_handle
|
let http_responses = app_handle
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ publish = false
|
|||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
chrono = { workspace = true, features = ["serde"] }
|
chrono = { workspace = true, features = ["serde"] }
|
||||||
git2 = { version = "0.20.0", features = ["vendored-libgit2", "vendored-openssl"] }
|
git2 = { version = "0.20.4", features = ["vendored-libgit2", "vendored-openssl"] }
|
||||||
log = { workspace = true }
|
log = { workspace = true }
|
||||||
serde = { workspace = true, features = ["derive"] }
|
serde = { workspace = true, features = ["derive"] }
|
||||||
serde_json = { workspace = true }
|
serde_json = { workspace = true }
|
||||||
|
|||||||
@@ -8,7 +8,7 @@ publish = false
|
|||||||
async-compression = { version = "0.4", features = ["tokio", "gzip", "deflate", "brotli", "zstd"] }
|
async-compression = { version = "0.4", features = ["tokio", "gzip", "deflate", "brotli", "zstd"] }
|
||||||
async-trait = "0.1"
|
async-trait = "0.1"
|
||||||
brotli = "7"
|
brotli = "7"
|
||||||
bytes = "1.5.0"
|
bytes = "1.11.1"
|
||||||
cookie = "0.18.1"
|
cookie = "0.18.1"
|
||||||
flate2 = "1"
|
flate2 = "1"
|
||||||
futures-util = "0.3"
|
futures-util = "0.3"
|
||||||
|
|||||||
14
crates/yaak-plugins/bindings/gen_events.ts
generated
14
crates/yaak-plugins/bindings/gen_events.ts
generated
@@ -66,7 +66,9 @@ export type DeleteModelRequest = { model: string, id: string, };
|
|||||||
|
|
||||||
export type DeleteModelResponse = { model: AnyModel, };
|
export type DeleteModelResponse = { model: AnyModel, };
|
||||||
|
|
||||||
export type EditorLanguage = "text" | "javascript" | "json" | "html" | "xml" | "graphql" | "markdown";
|
export type DialogSize = "sm" | "md" | "lg" | "full" | "dynamic";
|
||||||
|
|
||||||
|
export type EditorLanguage = "text" | "javascript" | "json" | "html" | "xml" | "graphql" | "markdown" | "c" | "clojure" | "csharp" | "go" | "http" | "java" | "kotlin" | "objective_c" | "ocaml" | "php" | "powershell" | "python" | "r" | "ruby" | "shell" | "swift";
|
||||||
|
|
||||||
export type EmptyPayload = {};
|
export type EmptyPayload = {};
|
||||||
|
|
||||||
@@ -172,7 +174,11 @@ hideGutter?: boolean,
|
|||||||
/**
|
/**
|
||||||
* Language for syntax highlighting
|
* Language for syntax highlighting
|
||||||
*/
|
*/
|
||||||
language?: EditorLanguage, readOnly?: boolean, completionOptions?: Array<GenericCompletionOption>,
|
language?: EditorLanguage, readOnly?: boolean,
|
||||||
|
/**
|
||||||
|
* Fixed number of visible rows
|
||||||
|
*/
|
||||||
|
rows?: number, completionOptions?: Array<GenericCompletionOption>,
|
||||||
/**
|
/**
|
||||||
* The name of the input. The value will be stored at this object attribute in the resulting data
|
* The name of the input. The value will be stored at this object attribute in the resulting data
|
||||||
*/
|
*/
|
||||||
@@ -476,9 +482,9 @@ label: string, title?: string, size?: WindowSize, dataDirKey?: string, };
|
|||||||
|
|
||||||
export type PluginContext = { id: string, label: string | null, workspaceId: string | null, };
|
export type PluginContext = { id: string, label: string | null, workspaceId: string | null, };
|
||||||
|
|
||||||
export type PromptFormRequest = { id: string, title: string, description?: string, inputs: Array<FormInput>, confirmText?: string, cancelText?: string, };
|
export type PromptFormRequest = { id: string, title: string, description?: string, inputs: Array<FormInput>, confirmText?: string, cancelText?: string, size?: DialogSize, };
|
||||||
|
|
||||||
export type PromptFormResponse = { values: { [key in string]?: JsonPrimitive } | null, };
|
export type PromptFormResponse = { values: { [key in string]?: JsonPrimitive } | null, done?: boolean, };
|
||||||
|
|
||||||
export type PromptTextRequest = { id: string, title: string, label: string, description?: string, defaultValue?: string, placeholder?: string,
|
export type PromptTextRequest = { id: string, title: string, label: string, description?: string, defaultValue?: string, placeholder?: string,
|
||||||
/**
|
/**
|
||||||
|
|||||||
2
crates/yaak-plugins/bindings/gen_models.ts
generated
2
crates/yaak-plugins/bindings/gen_models.ts
generated
@@ -49,7 +49,7 @@ export type HttpResponseEvent = { model: "http_response_event", id: string, crea
|
|||||||
* This mirrors `yaak_http::sender::HttpResponseEvent` but with serde support.
|
* This mirrors `yaak_http::sender::HttpResponseEvent` but with serde support.
|
||||||
* The `From` impl is in yaak-http to avoid circular dependencies.
|
* The `From` impl is in yaak-http to avoid circular dependencies.
|
||||||
*/
|
*/
|
||||||
export type HttpResponseEventData = { "type": "setting", name: string, value: string, } | { "type": "info", message: string, } | { "type": "redirect", url: string, status: number, behavior: string, } | { "type": "send_url", method: string, path: string, } | { "type": "receive_url", version: string, status: string, } | { "type": "header_up", name: string, value: string, } | { "type": "header_down", name: string, value: string, } | { "type": "chunk_sent", bytes: number, } | { "type": "chunk_received", bytes: number, } | { "type": "dns_resolved", hostname: string, addresses: Array<string>, duration: bigint, overridden: boolean, };
|
export type HttpResponseEventData = { "type": "setting", name: string, value: string, } | { "type": "info", message: string, } | { "type": "redirect", url: string, status: number, behavior: string, } | { "type": "send_url", method: string, scheme: string, username: string, password: string, host: string, port: number, path: string, query: string, fragment: string, } | { "type": "receive_url", version: string, status: string, } | { "type": "header_up", name: string, value: string, } | { "type": "header_down", name: string, value: string, } | { "type": "chunk_sent", bytes: number, } | { "type": "chunk_received", bytes: number, } | { "type": "dns_resolved", hostname: string, addresses: Array<string>, duration: bigint, overridden: boolean, };
|
||||||
|
|
||||||
export type HttpResponseHeader = { name: string, value: string, };
|
export type HttpResponseHeader = { name: string, value: string, };
|
||||||
|
|
||||||
|
|||||||
@@ -587,6 +587,19 @@ pub struct PromptFormRequest {
|
|||||||
pub confirm_text: Option<String>,
|
pub confirm_text: Option<String>,
|
||||||
#[ts(optional)]
|
#[ts(optional)]
|
||||||
pub cancel_text: Option<String>,
|
pub cancel_text: Option<String>,
|
||||||
|
#[ts(optional)]
|
||||||
|
pub size: Option<DialogSize>,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, Clone, Serialize, Deserialize, TS)]
|
||||||
|
#[serde(rename_all = "snake_case")]
|
||||||
|
#[ts(export, export_to = "gen_events.ts")]
|
||||||
|
pub enum DialogSize {
|
||||||
|
Sm,
|
||||||
|
Md,
|
||||||
|
Lg,
|
||||||
|
Full,
|
||||||
|
Dynamic,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Debug, Clone, Default, Serialize, Deserialize, TS)]
|
#[derive(Debug, Clone, Default, Serialize, Deserialize, TS)]
|
||||||
@@ -594,6 +607,8 @@ pub struct PromptFormRequest {
|
|||||||
#[ts(export, export_to = "gen_events.ts")]
|
#[ts(export, export_to = "gen_events.ts")]
|
||||||
pub struct PromptFormResponse {
|
pub struct PromptFormResponse {
|
||||||
pub values: Option<HashMap<String, JsonPrimitive>>,
|
pub values: Option<HashMap<String, JsonPrimitive>>,
|
||||||
|
#[ts(optional)]
|
||||||
|
pub done: Option<bool>,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Debug, Clone, Default, Serialize, Deserialize, TS)]
|
#[derive(Debug, Clone, Default, Serialize, Deserialize, TS)]
|
||||||
@@ -936,6 +951,22 @@ pub enum EditorLanguage {
|
|||||||
Xml,
|
Xml,
|
||||||
Graphql,
|
Graphql,
|
||||||
Markdown,
|
Markdown,
|
||||||
|
C,
|
||||||
|
Clojure,
|
||||||
|
Csharp,
|
||||||
|
Go,
|
||||||
|
Http,
|
||||||
|
Java,
|
||||||
|
Kotlin,
|
||||||
|
ObjectiveC,
|
||||||
|
Ocaml,
|
||||||
|
Php,
|
||||||
|
Powershell,
|
||||||
|
Python,
|
||||||
|
R,
|
||||||
|
Ruby,
|
||||||
|
Shell,
|
||||||
|
Swift,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl Default for EditorLanguage {
|
impl Default for EditorLanguage {
|
||||||
@@ -966,6 +997,10 @@ pub struct FormInputEditor {
|
|||||||
#[ts(optional)]
|
#[ts(optional)]
|
||||||
pub read_only: Option<bool>,
|
pub read_only: Option<bool>,
|
||||||
|
|
||||||
|
/// Fixed number of visible rows
|
||||||
|
#[ts(optional)]
|
||||||
|
pub rows: Option<i32>,
|
||||||
|
|
||||||
#[ts(optional)]
|
#[ts(optional)]
|
||||||
pub completion_options: Option<Vec<GenericCompletionOption>>,
|
pub completion_options: Option<Vec<GenericCompletionOption>>,
|
||||||
}
|
}
|
||||||
|
|||||||
236
package-lock.json
generated
236
package-lock.json
generated
@@ -13,6 +13,7 @@
|
|||||||
"packages/plugin-runtime-types",
|
"packages/plugin-runtime-types",
|
||||||
"plugins-external/mcp-server",
|
"plugins-external/mcp-server",
|
||||||
"plugins-external/template-function-faker",
|
"plugins-external/template-function-faker",
|
||||||
|
"plugins-external/httpsnippet",
|
||||||
"plugins/action-copy-curl",
|
"plugins/action-copy-curl",
|
||||||
"plugins/action-copy-grpcurl",
|
"plugins/action-copy-grpcurl",
|
||||||
"plugins/action-send-folder",
|
"plugins/action-send-folder",
|
||||||
@@ -62,6 +63,13 @@
|
|||||||
"crates/yaak-ws",
|
"crates/yaak-ws",
|
||||||
"src-web"
|
"src-web"
|
||||||
],
|
],
|
||||||
|
"dependencies": {
|
||||||
|
"@codemirror/lang-go": "^6.0.1",
|
||||||
|
"@codemirror/lang-java": "^6.0.2",
|
||||||
|
"@codemirror/lang-php": "^6.0.2",
|
||||||
|
"@codemirror/lang-python": "^6.2.1",
|
||||||
|
"@codemirror/legacy-modes": "^6.5.2"
|
||||||
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@biomejs/biome": "^2.3.13",
|
"@biomejs/biome": "^2.3.13",
|
||||||
"@tauri-apps/cli": "^2.9.6",
|
"@tauri-apps/cli": "^2.9.6",
|
||||||
@@ -736,6 +744,19 @@
|
|||||||
"@lezer/css": "^1.1.7"
|
"@lezer/css": "^1.1.7"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"node_modules/@codemirror/lang-go": {
|
||||||
|
"version": "6.0.1",
|
||||||
|
"resolved": "https://registry.npmjs.org/@codemirror/lang-go/-/lang-go-6.0.1.tgz",
|
||||||
|
"integrity": "sha512-7fNvbyNylvqCphW9HD6WFnRpcDjr+KXX/FgqXy5H5ZS0eC5edDljukm/yNgYkwTsgp2busdod50AOTIy6Jikfg==",
|
||||||
|
"license": "MIT",
|
||||||
|
"dependencies": {
|
||||||
|
"@codemirror/autocomplete": "^6.0.0",
|
||||||
|
"@codemirror/language": "^6.6.0",
|
||||||
|
"@codemirror/state": "^6.0.0",
|
||||||
|
"@lezer/common": "^1.0.0",
|
||||||
|
"@lezer/go": "^1.0.0"
|
||||||
|
}
|
||||||
|
},
|
||||||
"node_modules/@codemirror/lang-html": {
|
"node_modules/@codemirror/lang-html": {
|
||||||
"version": "6.4.11",
|
"version": "6.4.11",
|
||||||
"resolved": "https://registry.npmjs.org/@codemirror/lang-html/-/lang-html-6.4.11.tgz",
|
"resolved": "https://registry.npmjs.org/@codemirror/lang-html/-/lang-html-6.4.11.tgz",
|
||||||
@@ -753,6 +774,16 @@
|
|||||||
"@lezer/html": "^1.3.12"
|
"@lezer/html": "^1.3.12"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"node_modules/@codemirror/lang-java": {
|
||||||
|
"version": "6.0.2",
|
||||||
|
"resolved": "https://registry.npmjs.org/@codemirror/lang-java/-/lang-java-6.0.2.tgz",
|
||||||
|
"integrity": "sha512-m5Nt1mQ/cznJY7tMfQTJchmrjdjQ71IDs+55d1GAa8DGaB8JXWsVCkVT284C3RTASaY43YknrK2X3hPO/J3MOQ==",
|
||||||
|
"license": "MIT",
|
||||||
|
"dependencies": {
|
||||||
|
"@codemirror/language": "^6.0.0",
|
||||||
|
"@lezer/java": "^1.0.0"
|
||||||
|
}
|
||||||
|
},
|
||||||
"node_modules/@codemirror/lang-javascript": {
|
"node_modules/@codemirror/lang-javascript": {
|
||||||
"version": "6.2.4",
|
"version": "6.2.4",
|
||||||
"resolved": "https://registry.npmjs.org/@codemirror/lang-javascript/-/lang-javascript-6.2.4.tgz",
|
"resolved": "https://registry.npmjs.org/@codemirror/lang-javascript/-/lang-javascript-6.2.4.tgz",
|
||||||
@@ -793,6 +824,32 @@
|
|||||||
"@lezer/markdown": "^1.0.0"
|
"@lezer/markdown": "^1.0.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"node_modules/@codemirror/lang-php": {
|
||||||
|
"version": "6.0.2",
|
||||||
|
"resolved": "https://registry.npmjs.org/@codemirror/lang-php/-/lang-php-6.0.2.tgz",
|
||||||
|
"integrity": "sha512-ZKy2v1n8Fc8oEXj0Th0PUMXzQJ0AIR6TaZU+PbDHExFwdu+guzOA4jmCHS1Nz4vbFezwD7LyBdDnddSJeScMCA==",
|
||||||
|
"license": "MIT",
|
||||||
|
"dependencies": {
|
||||||
|
"@codemirror/lang-html": "^6.0.0",
|
||||||
|
"@codemirror/language": "^6.0.0",
|
||||||
|
"@codemirror/state": "^6.0.0",
|
||||||
|
"@lezer/common": "^1.0.0",
|
||||||
|
"@lezer/php": "^1.0.0"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"node_modules/@codemirror/lang-python": {
|
||||||
|
"version": "6.2.1",
|
||||||
|
"resolved": "https://registry.npmjs.org/@codemirror/lang-python/-/lang-python-6.2.1.tgz",
|
||||||
|
"integrity": "sha512-IRjC8RUBhn9mGR9ywecNhB51yePWCGgvHfY1lWN/Mrp3cKuHr0isDKia+9HnvhiWNnMpbGhWrkhuWOc09exRyw==",
|
||||||
|
"license": "MIT",
|
||||||
|
"dependencies": {
|
||||||
|
"@codemirror/autocomplete": "^6.3.2",
|
||||||
|
"@codemirror/language": "^6.8.0",
|
||||||
|
"@codemirror/state": "^6.0.0",
|
||||||
|
"@lezer/common": "^1.2.1",
|
||||||
|
"@lezer/python": "^1.1.4"
|
||||||
|
}
|
||||||
|
},
|
||||||
"node_modules/@codemirror/lang-xml": {
|
"node_modules/@codemirror/lang-xml": {
|
||||||
"version": "6.1.0",
|
"version": "6.1.0",
|
||||||
"resolved": "https://registry.npmjs.org/@codemirror/lang-xml/-/lang-xml-6.1.0.tgz",
|
"resolved": "https://registry.npmjs.org/@codemirror/lang-xml/-/lang-xml-6.1.0.tgz",
|
||||||
@@ -836,6 +893,15 @@
|
|||||||
"style-mod": "^4.0.0"
|
"style-mod": "^4.0.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"node_modules/@codemirror/legacy-modes": {
|
||||||
|
"version": "6.5.2",
|
||||||
|
"resolved": "https://registry.npmjs.org/@codemirror/legacy-modes/-/legacy-modes-6.5.2.tgz",
|
||||||
|
"integrity": "sha512-/jJbwSTazlQEDOQw2FJ8LEEKVS72pU0lx6oM54kGpL8t/NJ2Jda3CZ4pcltiKTdqYSRk3ug1B3pil1gsjA6+8Q==",
|
||||||
|
"license": "MIT",
|
||||||
|
"dependencies": {
|
||||||
|
"@codemirror/language": "^6.0.0"
|
||||||
|
}
|
||||||
|
},
|
||||||
"node_modules/@codemirror/lint": {
|
"node_modules/@codemirror/lint": {
|
||||||
"version": "6.9.2",
|
"version": "6.9.2",
|
||||||
"resolved": "https://registry.npmjs.org/@codemirror/lint/-/lint-6.9.2.tgz",
|
"resolved": "https://registry.npmjs.org/@codemirror/lint/-/lint-6.9.2.tgz",
|
||||||
@@ -1414,9 +1480,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@hono/node-server": {
|
"node_modules/@hono/node-server": {
|
||||||
"version": "1.19.8",
|
"version": "1.19.9",
|
||||||
"resolved": "https://registry.npmjs.org/@hono/node-server/-/node-server-1.19.8.tgz",
|
"resolved": "https://registry.npmjs.org/@hono/node-server/-/node-server-1.19.9.tgz",
|
||||||
"integrity": "sha512-0/g2lIOPzX8f3vzW1ggQgvG5mjtFBDBHFAzI5SFAi2DzSqS9luJwqg9T6O/gKYLi+inS7eNxBeIFkkghIPvrMA==",
|
"integrity": "sha512-vHL6w3ecZsky+8P5MD+eFfaGTyCeOHUIFYMGpQGbrBTSmNNoxv0if69rEZ5giu36weC5saFuznL411gRX7bJDw==",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"engines": {
|
"engines": {
|
||||||
"node": ">=18.14.1"
|
"node": ">=18.14.1"
|
||||||
@@ -1570,6 +1636,17 @@
|
|||||||
"lezer-generator": "src/lezer-generator.cjs"
|
"lezer-generator": "src/lezer-generator.cjs"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"node_modules/@lezer/go": {
|
||||||
|
"version": "1.0.1",
|
||||||
|
"resolved": "https://registry.npmjs.org/@lezer/go/-/go-1.0.1.tgz",
|
||||||
|
"integrity": "sha512-xToRsYxwsgJNHTgNdStpcvmbVuKxTapV0dM0wey1geMMRc9aggoVyKgzYp41D2/vVOx+Ii4hmE206kvxIXBVXQ==",
|
||||||
|
"license": "MIT",
|
||||||
|
"dependencies": {
|
||||||
|
"@lezer/common": "^1.2.0",
|
||||||
|
"@lezer/highlight": "^1.0.0",
|
||||||
|
"@lezer/lr": "^1.3.0"
|
||||||
|
}
|
||||||
|
},
|
||||||
"node_modules/@lezer/highlight": {
|
"node_modules/@lezer/highlight": {
|
||||||
"version": "1.2.3",
|
"version": "1.2.3",
|
||||||
"resolved": "https://registry.npmjs.org/@lezer/highlight/-/highlight-1.2.3.tgz",
|
"resolved": "https://registry.npmjs.org/@lezer/highlight/-/highlight-1.2.3.tgz",
|
||||||
@@ -1590,6 +1667,17 @@
|
|||||||
"@lezer/lr": "^1.0.0"
|
"@lezer/lr": "^1.0.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"node_modules/@lezer/java": {
|
||||||
|
"version": "1.1.3",
|
||||||
|
"resolved": "https://registry.npmjs.org/@lezer/java/-/java-1.1.3.tgz",
|
||||||
|
"integrity": "sha512-yHquUfujwg6Yu4Fd1GNHCvidIvJwi/1Xu2DaKl/pfWIA2c1oXkVvawH3NyXhCaFx4OdlYBVX5wvz2f7Aoa/4Xw==",
|
||||||
|
"license": "MIT",
|
||||||
|
"dependencies": {
|
||||||
|
"@lezer/common": "^1.2.0",
|
||||||
|
"@lezer/highlight": "^1.0.0",
|
||||||
|
"@lezer/lr": "^1.0.0"
|
||||||
|
}
|
||||||
|
},
|
||||||
"node_modules/@lezer/javascript": {
|
"node_modules/@lezer/javascript": {
|
||||||
"version": "1.5.4",
|
"version": "1.5.4",
|
||||||
"resolved": "https://registry.npmjs.org/@lezer/javascript/-/javascript-1.5.4.tgz",
|
"resolved": "https://registry.npmjs.org/@lezer/javascript/-/javascript-1.5.4.tgz",
|
||||||
@@ -1631,6 +1719,28 @@
|
|||||||
"@lezer/highlight": "^1.0.0"
|
"@lezer/highlight": "^1.0.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"node_modules/@lezer/php": {
|
||||||
|
"version": "1.0.5",
|
||||||
|
"resolved": "https://registry.npmjs.org/@lezer/php/-/php-1.0.5.tgz",
|
||||||
|
"integrity": "sha512-W7asp9DhM6q0W6DYNwIkLSKOvxlXRrif+UXBMxzsJUuqmhE7oVU+gS3THO4S/Puh7Xzgm858UNaFi6dxTP8dJA==",
|
||||||
|
"license": "MIT",
|
||||||
|
"dependencies": {
|
||||||
|
"@lezer/common": "^1.2.0",
|
||||||
|
"@lezer/highlight": "^1.0.0",
|
||||||
|
"@lezer/lr": "^1.1.0"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"node_modules/@lezer/python": {
|
||||||
|
"version": "1.1.18",
|
||||||
|
"resolved": "https://registry.npmjs.org/@lezer/python/-/python-1.1.18.tgz",
|
||||||
|
"integrity": "sha512-31FiUrU7z9+d/ElGQLJFXl+dKOdx0jALlP3KEOsGTex8mvj+SoE1FgItcHWK/axkxCHGUSpqIHt6JAWfWu9Rhg==",
|
||||||
|
"license": "MIT",
|
||||||
|
"dependencies": {
|
||||||
|
"@lezer/common": "^1.2.0",
|
||||||
|
"@lezer/highlight": "^1.0.0",
|
||||||
|
"@lezer/lr": "^1.0.0"
|
||||||
|
}
|
||||||
|
},
|
||||||
"node_modules/@lezer/xml": {
|
"node_modules/@lezer/xml": {
|
||||||
"version": "1.0.6",
|
"version": "1.0.6",
|
||||||
"resolved": "https://registry.npmjs.org/@lezer/xml/-/xml-1.0.6.tgz",
|
"resolved": "https://registry.npmjs.org/@lezer/xml/-/xml-1.0.6.tgz",
|
||||||
@@ -1675,12 +1785,12 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@modelcontextprotocol/sdk": {
|
"node_modules/@modelcontextprotocol/sdk": {
|
||||||
"version": "1.25.2",
|
"version": "1.26.0",
|
||||||
"resolved": "https://registry.npmjs.org/@modelcontextprotocol/sdk/-/sdk-1.25.2.tgz",
|
"resolved": "https://registry.npmjs.org/@modelcontextprotocol/sdk/-/sdk-1.26.0.tgz",
|
||||||
"integrity": "sha512-LZFeo4F9M5qOhC/Uc1aQSrBHxMrvxett+9KLHt7OhcExtoiRN9DKgbZffMP/nxjutWDQpfMDfP3nkHI4X9ijww==",
|
"integrity": "sha512-Y5RmPncpiDtTXDbLKswIJzTqu2hyBKxTNsgKqKclDbhIgg1wgtf1fRuvxgTnRfcnxtvvgbIEcqUOzZrJ6iSReg==",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@hono/node-server": "^1.19.7",
|
"@hono/node-server": "^1.19.9",
|
||||||
"ajv": "^8.17.1",
|
"ajv": "^8.17.1",
|
||||||
"ajv-formats": "^3.0.1",
|
"ajv-formats": "^3.0.1",
|
||||||
"content-type": "^1.0.5",
|
"content-type": "^1.0.5",
|
||||||
@@ -1688,14 +1798,15 @@
|
|||||||
"cross-spawn": "^7.0.5",
|
"cross-spawn": "^7.0.5",
|
||||||
"eventsource": "^3.0.2",
|
"eventsource": "^3.0.2",
|
||||||
"eventsource-parser": "^3.0.0",
|
"eventsource-parser": "^3.0.0",
|
||||||
"express": "^5.0.1",
|
"express": "^5.2.1",
|
||||||
"express-rate-limit": "^7.5.0",
|
"express-rate-limit": "^8.2.1",
|
||||||
"jose": "^6.1.1",
|
"hono": "^4.11.4",
|
||||||
|
"jose": "^6.1.3",
|
||||||
"json-schema-typed": "^8.0.2",
|
"json-schema-typed": "^8.0.2",
|
||||||
"pkce-challenge": "^5.0.0",
|
"pkce-challenge": "^5.0.0",
|
||||||
"raw-body": "^3.0.0",
|
"raw-body": "^3.0.0",
|
||||||
"zod": "^3.25 || ^4.0",
|
"zod": "^3.25 || ^4.0",
|
||||||
"zod-to-json-schema": "^3.25.0"
|
"zod-to-json-schema": "^3.25.1"
|
||||||
},
|
},
|
||||||
"engines": {
|
"engines": {
|
||||||
"node": ">=18"
|
"node": ">=18"
|
||||||
@@ -2021,6 +2132,19 @@
|
|||||||
"node": ">=16.9"
|
"node": ">=16.9"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"node_modules/@readme/httpsnippet": {
|
||||||
|
"version": "11.0.0",
|
||||||
|
"resolved": "https://registry.npmjs.org/@readme/httpsnippet/-/httpsnippet-11.0.0.tgz",
|
||||||
|
"integrity": "sha512-XSyaAsJkZfmMO9R4WDlVJARZgd4wlImftSkMkKclidniXA1h6DTya9iTqJenQo9mHQLh3u6kAC3CDRaIV+LbLw==",
|
||||||
|
"license": "MIT",
|
||||||
|
"dependencies": {
|
||||||
|
"qs": "^6.11.2",
|
||||||
|
"stringify-object": "^3.3.0"
|
||||||
|
},
|
||||||
|
"engines": {
|
||||||
|
"node": ">=18"
|
||||||
|
}
|
||||||
|
},
|
||||||
"node_modules/@replit/codemirror-emacs": {
|
"node_modules/@replit/codemirror-emacs": {
|
||||||
"version": "6.1.0",
|
"version": "6.1.0",
|
||||||
"resolved": "https://registry.npmjs.org/@replit/codemirror-emacs/-/codemirror-emacs-6.1.0.tgz",
|
"resolved": "https://registry.npmjs.org/@replit/codemirror-emacs/-/codemirror-emacs-6.1.0.tgz",
|
||||||
@@ -4044,6 +4168,10 @@
|
|||||||
"resolved": "plugins/filter-xpath",
|
"resolved": "plugins/filter-xpath",
|
||||||
"link": true
|
"link": true
|
||||||
},
|
},
|
||||||
|
"node_modules/@yaak/httpsnippet": {
|
||||||
|
"resolved": "plugins-external/httpsnippet",
|
||||||
|
"link": true
|
||||||
|
},
|
||||||
"node_modules/@yaak/importer-curl": {
|
"node_modules/@yaak/importer-curl": {
|
||||||
"resolved": "plugins/importer-curl",
|
"resolved": "plugins/importer-curl",
|
||||||
"link": true
|
"link": true
|
||||||
@@ -6865,10 +6993,13 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/express-rate-limit": {
|
"node_modules/express-rate-limit": {
|
||||||
"version": "7.5.1",
|
"version": "8.2.1",
|
||||||
"resolved": "https://registry.npmjs.org/express-rate-limit/-/express-rate-limit-7.5.1.tgz",
|
"resolved": "https://registry.npmjs.org/express-rate-limit/-/express-rate-limit-8.2.1.tgz",
|
||||||
"integrity": "sha512-7iN8iPMDzOMHPUYllBEsQdWVB6fPDMPqwjBaFrgr4Jgr/+okjvzAy+UHlYYL/Vs0OsOrMkwS6PJDkFlJwoxUnw==",
|
"integrity": "sha512-PCZEIEIxqwhzw4KF0n7QF4QqruVTcF73O5kFKUnGOyjbCCgizBBiFaYpd/fnBLUMPw/BWw9OsiN7GgrNYr7j6g==",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
|
"dependencies": {
|
||||||
|
"ip-address": "10.0.1"
|
||||||
|
},
|
||||||
"engines": {
|
"engines": {
|
||||||
"node": ">= 16"
|
"node": ">= 16"
|
||||||
},
|
},
|
||||||
@@ -7407,6 +7538,12 @@
|
|||||||
"url": "https://github.com/sponsors/ljharb"
|
"url": "https://github.com/sponsors/ljharb"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"node_modules/get-own-enumerable-property-symbols": {
|
||||||
|
"version": "3.0.2",
|
||||||
|
"resolved": "https://registry.npmjs.org/get-own-enumerable-property-symbols/-/get-own-enumerable-property-symbols-3.0.2.tgz",
|
||||||
|
"integrity": "sha512-I0UBV/XOz1XkIJHEUDMZAbzCThU/H8DxmSfmdGcKPnVhu2VfFqr34jr9777IyaTYvxjedWhqVIilEDsCdP5G6g==",
|
||||||
|
"license": "ISC"
|
||||||
|
},
|
||||||
"node_modules/get-proto": {
|
"node_modules/get-proto": {
|
||||||
"version": "1.0.1",
|
"version": "1.0.1",
|
||||||
"resolved": "https://registry.npmjs.org/get-proto/-/get-proto-1.0.1.tgz",
|
"resolved": "https://registry.npmjs.org/get-proto/-/get-proto-1.0.1.tgz",
|
||||||
@@ -8135,6 +8272,15 @@
|
|||||||
"node": ">= 0.4"
|
"node": ">= 0.4"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"node_modules/ip-address": {
|
||||||
|
"version": "10.0.1",
|
||||||
|
"resolved": "https://registry.npmjs.org/ip-address/-/ip-address-10.0.1.tgz",
|
||||||
|
"integrity": "sha512-NWv9YLW4PoW2B7xtzaS3NCot75m6nK7Icdv0o3lfMceJVRfSoQwqD4wEH5rLwoKJwUiZ/rfpiVBhnaF0FK4HoA==",
|
||||||
|
"license": "MIT",
|
||||||
|
"engines": {
|
||||||
|
"node": ">= 12"
|
||||||
|
}
|
||||||
|
},
|
||||||
"node_modules/ip-bigint": {
|
"node_modules/ip-bigint": {
|
||||||
"version": "7.3.0",
|
"version": "7.3.0",
|
||||||
"resolved": "https://registry.npmjs.org/ip-bigint/-/ip-bigint-7.3.0.tgz",
|
"resolved": "https://registry.npmjs.org/ip-bigint/-/ip-bigint-7.3.0.tgz",
|
||||||
@@ -8516,6 +8662,15 @@
|
|||||||
"url": "https://github.com/sponsors/ljharb"
|
"url": "https://github.com/sponsors/ljharb"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"node_modules/is-obj": {
|
||||||
|
"version": "1.0.1",
|
||||||
|
"resolved": "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz",
|
||||||
|
"integrity": "sha512-l4RyHgRqGN4Y3+9JHVrNqO+tN0rV5My76uW5/nuO4K1b6vw5G8d/cmFjP9tRfEsdhZNt0IFdZuK/c2Vr4Nb+Qg==",
|
||||||
|
"license": "MIT",
|
||||||
|
"engines": {
|
||||||
|
"node": ">=0.10.0"
|
||||||
|
}
|
||||||
|
},
|
||||||
"node_modules/is-plain-obj": {
|
"node_modules/is-plain-obj": {
|
||||||
"version": "4.1.0",
|
"version": "4.1.0",
|
||||||
"resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-4.1.0.tgz",
|
"resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-4.1.0.tgz",
|
||||||
@@ -13776,6 +13931,29 @@
|
|||||||
"url": "https://github.com/sponsors/wooorm"
|
"url": "https://github.com/sponsors/wooorm"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"node_modules/stringify-object": {
|
||||||
|
"version": "3.3.0",
|
||||||
|
"resolved": "https://registry.npmjs.org/stringify-object/-/stringify-object-3.3.0.tgz",
|
||||||
|
"integrity": "sha512-rHqiFh1elqCQ9WPLIC8I0Q/g/wj5J1eMkyoiD6eoQApWHP0FtlK7rqnhmabL5VUY9JQCcqwwvlOaSuutekgyrw==",
|
||||||
|
"license": "BSD-2-Clause",
|
||||||
|
"dependencies": {
|
||||||
|
"get-own-enumerable-property-symbols": "^3.0.0",
|
||||||
|
"is-obj": "^1.0.1",
|
||||||
|
"is-regexp": "^1.0.0"
|
||||||
|
},
|
||||||
|
"engines": {
|
||||||
|
"node": ">=4"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"node_modules/stringify-object/node_modules/is-regexp": {
|
||||||
|
"version": "1.0.0",
|
||||||
|
"resolved": "https://registry.npmjs.org/is-regexp/-/is-regexp-1.0.0.tgz",
|
||||||
|
"integrity": "sha512-7zjFAPO4/gwyQAAgRRmqeEeyIICSdmCqa3tsVHMdBzaXXRiqopZL4Cyghg/XulGWrtABTpbnYYzzIRffLkP4oA==",
|
||||||
|
"license": "MIT",
|
||||||
|
"engines": {
|
||||||
|
"node": ">=0.10.0"
|
||||||
|
}
|
||||||
|
},
|
||||||
"node_modules/strip-ansi": {
|
"node_modules/strip-ansi": {
|
||||||
"version": "7.1.2",
|
"version": "7.1.2",
|
||||||
"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.2.tgz",
|
"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.2.tgz",
|
||||||
@@ -15775,13 +15953,41 @@
|
|||||||
"undici-types": "~7.16.0"
|
"undici-types": "~7.16.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"plugins-external/httpsnippet": {
|
||||||
|
"name": "@yaak/httpsnippet",
|
||||||
|
"version": "1.0.0",
|
||||||
|
"dependencies": {
|
||||||
|
"@readme/httpsnippet": "^11.0.0"
|
||||||
|
},
|
||||||
|
"devDependencies": {
|
||||||
|
"@types/node": "^22.0.0",
|
||||||
|
"typescript": "^5.9.3"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"plugins-external/httpsnippet/node_modules/@types/node": {
|
||||||
|
"version": "22.19.9",
|
||||||
|
"resolved": "https://registry.npmjs.org/@types/node/-/node-22.19.9.tgz",
|
||||||
|
"integrity": "sha512-PD03/U8g1F9T9MI+1OBisaIARhSzeidsUjQaf51fOxrfjeiKN9bLVO06lHuHYjxdnqLWJijJHfqXPSJri2EM2A==",
|
||||||
|
"dev": true,
|
||||||
|
"license": "MIT",
|
||||||
|
"dependencies": {
|
||||||
|
"undici-types": "~6.21.0"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"plugins-external/httpsnippet/node_modules/undici-types": {
|
||||||
|
"version": "6.21.0",
|
||||||
|
"resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.21.0.tgz",
|
||||||
|
"integrity": "sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ==",
|
||||||
|
"dev": true,
|
||||||
|
"license": "MIT"
|
||||||
|
},
|
||||||
"plugins-external/mcp-server": {
|
"plugins-external/mcp-server": {
|
||||||
"name": "@yaak/mcp-server",
|
"name": "@yaak/mcp-server",
|
||||||
"version": "0.1.7",
|
"version": "0.1.7",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@hono/mcp": "^0.2.3",
|
"@hono/mcp": "^0.2.3",
|
||||||
"@hono/node-server": "^1.19.7",
|
"@hono/node-server": "^1.19.7",
|
||||||
"@modelcontextprotocol/sdk": "^1.25.2",
|
"@modelcontextprotocol/sdk": "^1.26.0",
|
||||||
"hono": "^4.11.7",
|
"hono": "^4.11.7",
|
||||||
"zod": "^3.25.76"
|
"zod": "^3.25.76"
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -12,6 +12,7 @@
|
|||||||
"packages/plugin-runtime-types",
|
"packages/plugin-runtime-types",
|
||||||
"plugins-external/mcp-server",
|
"plugins-external/mcp-server",
|
||||||
"plugins-external/template-function-faker",
|
"plugins-external/template-function-faker",
|
||||||
|
"plugins-external/httpsnippet",
|
||||||
"plugins/action-copy-curl",
|
"plugins/action-copy-curl",
|
||||||
"plugins/action-copy-grpcurl",
|
"plugins/action-copy-grpcurl",
|
||||||
"plugins/action-send-folder",
|
"plugins/action-send-folder",
|
||||||
@@ -104,5 +105,12 @@
|
|||||||
"npm-run-all": "^4.1.5",
|
"npm-run-all": "^4.1.5",
|
||||||
"typescript": "^5.8.3",
|
"typescript": "^5.8.3",
|
||||||
"vitest": "^3.2.4"
|
"vitest": "^3.2.4"
|
||||||
|
},
|
||||||
|
"dependencies": {
|
||||||
|
"@codemirror/lang-go": "^6.0.1",
|
||||||
|
"@codemirror/lang-java": "^6.0.2",
|
||||||
|
"@codemirror/lang-php": "^6.0.2",
|
||||||
|
"@codemirror/lang-python": "^6.2.1",
|
||||||
|
"@codemirror/legacy-modes": "^6.5.2"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -66,7 +66,9 @@ export type DeleteModelRequest = { model: string, id: string, };
|
|||||||
|
|
||||||
export type DeleteModelResponse = { model: AnyModel, };
|
export type DeleteModelResponse = { model: AnyModel, };
|
||||||
|
|
||||||
export type EditorLanguage = "text" | "javascript" | "json" | "html" | "xml" | "graphql" | "markdown";
|
export type DialogSize = "sm" | "md" | "lg" | "full" | "dynamic";
|
||||||
|
|
||||||
|
export type EditorLanguage = "text" | "javascript" | "json" | "html" | "xml" | "graphql" | "markdown" | "c" | "clojure" | "csharp" | "go" | "http" | "java" | "kotlin" | "objective_c" | "ocaml" | "php" | "powershell" | "python" | "r" | "ruby" | "shell" | "swift";
|
||||||
|
|
||||||
export type EmptyPayload = {};
|
export type EmptyPayload = {};
|
||||||
|
|
||||||
@@ -172,7 +174,11 @@ hideGutter?: boolean,
|
|||||||
/**
|
/**
|
||||||
* Language for syntax highlighting
|
* Language for syntax highlighting
|
||||||
*/
|
*/
|
||||||
language?: EditorLanguage, readOnly?: boolean, completionOptions?: Array<GenericCompletionOption>,
|
language?: EditorLanguage, readOnly?: boolean,
|
||||||
|
/**
|
||||||
|
* Fixed number of visible rows
|
||||||
|
*/
|
||||||
|
rows?: number, completionOptions?: Array<GenericCompletionOption>,
|
||||||
/**
|
/**
|
||||||
* The name of the input. The value will be stored at this object attribute in the resulting data
|
* The name of the input. The value will be stored at this object attribute in the resulting data
|
||||||
*/
|
*/
|
||||||
@@ -476,9 +482,9 @@ label: string, title?: string, size?: WindowSize, dataDirKey?: string, };
|
|||||||
|
|
||||||
export type PluginContext = { id: string, label: string | null, workspaceId: string | null, };
|
export type PluginContext = { id: string, label: string | null, workspaceId: string | null, };
|
||||||
|
|
||||||
export type PromptFormRequest = { id: string, title: string, description?: string, inputs: Array<FormInput>, confirmText?: string, cancelText?: string, };
|
export type PromptFormRequest = { id: string, title: string, description?: string, inputs: Array<FormInput>, confirmText?: string, cancelText?: string, size?: DialogSize, };
|
||||||
|
|
||||||
export type PromptFormResponse = { values: { [key in string]?: JsonPrimitive } | null, };
|
export type PromptFormResponse = { values: { [key in string]?: JsonPrimitive } | null, done?: boolean, };
|
||||||
|
|
||||||
export type PromptTextRequest = { id: string, title: string, label: string, description?: string, defaultValue?: string, placeholder?: string,
|
export type PromptTextRequest = { id: string, title: string, label: string, description?: string, defaultValue?: string, placeholder?: string,
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -49,7 +49,7 @@ export type HttpResponseEvent = { model: "http_response_event", id: string, crea
|
|||||||
* This mirrors `yaak_http::sender::HttpResponseEvent` but with serde support.
|
* This mirrors `yaak_http::sender::HttpResponseEvent` but with serde support.
|
||||||
* The `From` impl is in yaak-http to avoid circular dependencies.
|
* The `From` impl is in yaak-http to avoid circular dependencies.
|
||||||
*/
|
*/
|
||||||
export type HttpResponseEventData = { "type": "setting", name: string, value: string, } | { "type": "info", message: string, } | { "type": "redirect", url: string, status: number, behavior: string, } | { "type": "send_url", method: string, path: string, } | { "type": "receive_url", version: string, status: string, } | { "type": "header_up", name: string, value: string, } | { "type": "header_down", name: string, value: string, } | { "type": "chunk_sent", bytes: number, } | { "type": "chunk_received", bytes: number, } | { "type": "dns_resolved", hostname: string, addresses: Array<string>, duration: bigint, overridden: boolean, };
|
export type HttpResponseEventData = { "type": "setting", name: string, value: string, } | { "type": "info", message: string, } | { "type": "redirect", url: string, status: number, behavior: string, } | { "type": "send_url", method: string, scheme: string, username: string, password: string, host: string, port: number, path: string, query: string, fragment: string, } | { "type": "receive_url", version: string, status: string, } | { "type": "header_up", name: string, value: string, } | { "type": "header_down", name: string, value: string, } | { "type": "chunk_sent", bytes: number, } | { "type": "chunk_received", bytes: number, } | { "type": "dns_resolved", hostname: string, addresses: Array<string>, duration: bigint, overridden: boolean, };
|
||||||
|
|
||||||
export type HttpResponseHeader = { name: string, value: string, };
|
export type HttpResponseHeader = { name: string, value: string, };
|
||||||
|
|
||||||
|
|||||||
@@ -1,10 +1,12 @@
|
|||||||
import type {
|
import type {
|
||||||
FindHttpResponsesRequest,
|
FindHttpResponsesRequest,
|
||||||
FindHttpResponsesResponse,
|
FindHttpResponsesResponse,
|
||||||
|
FormInput,
|
||||||
GetCookieValueRequest,
|
GetCookieValueRequest,
|
||||||
GetCookieValueResponse,
|
GetCookieValueResponse,
|
||||||
GetHttpRequestByIdRequest,
|
GetHttpRequestByIdRequest,
|
||||||
GetHttpRequestByIdResponse,
|
GetHttpRequestByIdResponse,
|
||||||
|
JsonPrimitive,
|
||||||
ListCookieNamesResponse,
|
ListCookieNamesResponse,
|
||||||
ListFoldersRequest,
|
ListFoldersRequest,
|
||||||
ListFoldersResponse,
|
ListFoldersResponse,
|
||||||
@@ -27,6 +29,39 @@ import type {
|
|||||||
} from '../bindings/gen_events.ts';
|
} from '../bindings/gen_events.ts';
|
||||||
import type { Folder, HttpRequest } from '../bindings/gen_models.ts';
|
import type { Folder, HttpRequest } from '../bindings/gen_models.ts';
|
||||||
import type { JsonValue } from '../bindings/serde_json/JsonValue';
|
import type { JsonValue } from '../bindings/serde_json/JsonValue';
|
||||||
|
import type { MaybePromise } from '../helpers';
|
||||||
|
|
||||||
|
export type CallPromptFormDynamicArgs = {
|
||||||
|
values: { [key in string]?: JsonPrimitive };
|
||||||
|
};
|
||||||
|
|
||||||
|
type AddDynamicMethod<T> = {
|
||||||
|
dynamic?: (
|
||||||
|
ctx: Context,
|
||||||
|
args: CallPromptFormDynamicArgs,
|
||||||
|
) => MaybePromise<Partial<T> | null | undefined>;
|
||||||
|
};
|
||||||
|
|
||||||
|
// biome-ignore lint/suspicious/noExplicitAny: distributive conditional type pattern
|
||||||
|
type AddDynamic<T> = T extends any
|
||||||
|
? T extends { inputs?: FormInput[] }
|
||||||
|
? Omit<T, 'inputs'> & {
|
||||||
|
inputs: Array<AddDynamic<FormInput>>;
|
||||||
|
dynamic?: (
|
||||||
|
ctx: Context,
|
||||||
|
args: CallPromptFormDynamicArgs,
|
||||||
|
) => MaybePromise<
|
||||||
|
Partial<Omit<T, 'inputs'> & { inputs: Array<AddDynamic<FormInput>> }> | null | undefined
|
||||||
|
>;
|
||||||
|
}
|
||||||
|
: T & AddDynamicMethod<T>
|
||||||
|
: never;
|
||||||
|
|
||||||
|
export type DynamicPromptFormArg = AddDynamic<FormInput>;
|
||||||
|
|
||||||
|
type DynamicPromptFormRequest = Omit<PromptFormRequest, 'inputs'> & {
|
||||||
|
inputs: DynamicPromptFormArg[];
|
||||||
|
};
|
||||||
|
|
||||||
export type WorkspaceHandle = Pick<WorkspaceInfo, 'id' | 'name'>;
|
export type WorkspaceHandle = Pick<WorkspaceInfo, 'id' | 'name'>;
|
||||||
|
|
||||||
@@ -39,7 +74,7 @@ export interface Context {
|
|||||||
};
|
};
|
||||||
prompt: {
|
prompt: {
|
||||||
text(args: PromptTextRequest): Promise<PromptTextResponse['value']>;
|
text(args: PromptTextRequest): Promise<PromptTextResponse['value']>;
|
||||||
form(args: PromptFormRequest): Promise<PromptFormResponse['values']>;
|
form(args: DynamicPromptFormRequest): Promise<PromptFormResponse['values']>;
|
||||||
};
|
};
|
||||||
store: {
|
store: {
|
||||||
set<T>(key: string, value: T): Promise<void>;
|
set<T>(key: string, value: T): Promise<void>;
|
||||||
|
|||||||
@@ -2,21 +2,22 @@ import type { AuthenticationPlugin } from './AuthenticationPlugin';
|
|||||||
|
|
||||||
import type { Context } from './Context';
|
import type { Context } from './Context';
|
||||||
import type { FilterPlugin } from './FilterPlugin';
|
import type { FilterPlugin } from './FilterPlugin';
|
||||||
|
import type { FolderActionPlugin } from './FolderActionPlugin';
|
||||||
import type { GrpcRequestActionPlugin } from './GrpcRequestActionPlugin';
|
import type { GrpcRequestActionPlugin } from './GrpcRequestActionPlugin';
|
||||||
import type { HttpRequestActionPlugin } from './HttpRequestActionPlugin';
|
import type { HttpRequestActionPlugin } from './HttpRequestActionPlugin';
|
||||||
import type { WebsocketRequestActionPlugin } from './WebsocketRequestActionPlugin';
|
|
||||||
import type { WorkspaceActionPlugin } from './WorkspaceActionPlugin';
|
|
||||||
import type { FolderActionPlugin } from './FolderActionPlugin';
|
|
||||||
import type { ImporterPlugin } from './ImporterPlugin';
|
import type { ImporterPlugin } from './ImporterPlugin';
|
||||||
import type { TemplateFunctionPlugin } from './TemplateFunctionPlugin';
|
import type { TemplateFunctionPlugin } from './TemplateFunctionPlugin';
|
||||||
import type { ThemePlugin } from './ThemePlugin';
|
import type { ThemePlugin } from './ThemePlugin';
|
||||||
|
import type { WebsocketRequestActionPlugin } from './WebsocketRequestActionPlugin';
|
||||||
|
import type { WorkspaceActionPlugin } from './WorkspaceActionPlugin';
|
||||||
|
|
||||||
export type { Context };
|
export type { Context };
|
||||||
export type { DynamicTemplateFunctionArg } from './TemplateFunctionPlugin';
|
|
||||||
export type { DynamicAuthenticationArg } from './AuthenticationPlugin';
|
export type { DynamicAuthenticationArg } from './AuthenticationPlugin';
|
||||||
|
export type { CallPromptFormDynamicArgs, DynamicPromptFormArg } from './Context';
|
||||||
|
export type { DynamicTemplateFunctionArg } from './TemplateFunctionPlugin';
|
||||||
export type { TemplateFunctionPlugin };
|
export type { TemplateFunctionPlugin };
|
||||||
export type { WorkspaceActionPlugin } from './WorkspaceActionPlugin';
|
|
||||||
export type { FolderActionPlugin } from './FolderActionPlugin';
|
export type { FolderActionPlugin } from './FolderActionPlugin';
|
||||||
|
export type { WorkspaceActionPlugin } from './WorkspaceActionPlugin';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The global structure of a Yaak plugin
|
* The global structure of a Yaak plugin
|
||||||
|
|||||||
@@ -1,7 +1,12 @@
|
|||||||
import console from 'node:console';
|
import console from 'node:console';
|
||||||
import { type Stats, statSync, watch } from 'node:fs';
|
import { type Stats, statSync, watch } from 'node:fs';
|
||||||
import path from 'node:path';
|
import path from 'node:path';
|
||||||
import type { Context, PluginDefinition } from '@yaakapp/api';
|
import type {
|
||||||
|
CallPromptFormDynamicArgs,
|
||||||
|
Context,
|
||||||
|
DynamicPromptFormArg,
|
||||||
|
PluginDefinition,
|
||||||
|
} from '@yaakapp/api';
|
||||||
import {
|
import {
|
||||||
applyFormInputDefaults,
|
applyFormInputDefaults,
|
||||||
validateTemplateFunctionArgs,
|
validateTemplateFunctionArgs,
|
||||||
@@ -12,6 +17,7 @@ import type {
|
|||||||
DeleteModelResponse,
|
DeleteModelResponse,
|
||||||
FindHttpResponsesResponse,
|
FindHttpResponsesResponse,
|
||||||
Folder,
|
Folder,
|
||||||
|
FormInput,
|
||||||
GetCookieValueRequest,
|
GetCookieValueRequest,
|
||||||
GetCookieValueResponse,
|
GetCookieValueResponse,
|
||||||
GetHttpRequestByIdResponse,
|
GetHttpRequestByIdResponse,
|
||||||
@@ -55,6 +61,7 @@ export class PluginInstance {
|
|||||||
#mod: PluginDefinition;
|
#mod: PluginDefinition;
|
||||||
#pluginToAppEvents: EventChannel;
|
#pluginToAppEvents: EventChannel;
|
||||||
#appToPluginEvents: EventChannel;
|
#appToPluginEvents: EventChannel;
|
||||||
|
#pendingDynamicForms = new Map<string, DynamicPromptFormArg[]>();
|
||||||
|
|
||||||
constructor(workerData: PluginWorkerData, pluginEvents: EventChannel) {
|
constructor(workerData: PluginWorkerData, pluginEvents: EventChannel) {
|
||||||
this.#workerData = workerData;
|
this.#workerData = workerData;
|
||||||
@@ -106,6 +113,7 @@ export class PluginInstance {
|
|||||||
|
|
||||||
async terminate() {
|
async terminate() {
|
||||||
await this.#mod?.dispose?.();
|
await this.#mod?.dispose?.();
|
||||||
|
this.#pendingDynamicForms.clear();
|
||||||
this.#unimportModule();
|
this.#unimportModule();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -299,7 +307,7 @@ export class PluginInstance {
|
|||||||
const replyPayload: InternalEventPayload = {
|
const replyPayload: InternalEventPayload = {
|
||||||
type: 'get_template_function_config_response',
|
type: 'get_template_function_config_response',
|
||||||
pluginRefId: this.#workerData.pluginRefId,
|
pluginRefId: this.#workerData.pluginRefId,
|
||||||
function: { ...fn, args: resolvedArgs },
|
function: { ...fn, args: stripDynamicCallbacks(resolvedArgs) },
|
||||||
};
|
};
|
||||||
this.#sendPayload(context, replyPayload, replyId);
|
this.#sendPayload(context, replyPayload, replyId);
|
||||||
return;
|
return;
|
||||||
@@ -326,7 +334,7 @@ export class PluginInstance {
|
|||||||
|
|
||||||
const replyPayload: InternalEventPayload = {
|
const replyPayload: InternalEventPayload = {
|
||||||
type: 'get_http_authentication_config_response',
|
type: 'get_http_authentication_config_response',
|
||||||
args: resolvedArgs,
|
args: stripDynamicCallbacks(resolvedArgs),
|
||||||
actions: resolvedActions,
|
actions: resolvedActions,
|
||||||
pluginRefId: this.#workerData.pluginRefId,
|
pluginRefId: this.#workerData.pluginRefId,
|
||||||
};
|
};
|
||||||
@@ -664,10 +672,66 @@ export class PluginInstance {
|
|||||||
return reply.value;
|
return reply.value;
|
||||||
},
|
},
|
||||||
form: async (args) => {
|
form: async (args) => {
|
||||||
const reply: PromptFormResponse = await this.#sendForReply(context, {
|
// Resolve dynamic callbacks on initial inputs using default values
|
||||||
type: 'prompt_form_request',
|
const defaults = applyFormInputDefaults(args.inputs, {});
|
||||||
...args,
|
const callArgs: CallPromptFormDynamicArgs = { values: defaults };
|
||||||
|
const resolvedInputs = await applyDynamicFormInput(
|
||||||
|
this.#newCtx(context),
|
||||||
|
args.inputs,
|
||||||
|
callArgs,
|
||||||
|
);
|
||||||
|
const strippedInputs = stripDynamicCallbacks(resolvedInputs);
|
||||||
|
|
||||||
|
// Build the event manually so we can get the event ID for keying
|
||||||
|
const eventToSend = this.#buildEventToSend(
|
||||||
|
context,
|
||||||
|
{ type: 'prompt_form_request', ...args, inputs: strippedInputs },
|
||||||
|
null,
|
||||||
|
);
|
||||||
|
|
||||||
|
// Store original inputs (with dynamic callbacks) for later resolution
|
||||||
|
this.#pendingDynamicForms.set(eventToSend.id, args.inputs);
|
||||||
|
|
||||||
|
const reply = await new Promise<PromptFormResponse>((resolve) => {
|
||||||
|
const cb = (event: InternalEvent) => {
|
||||||
|
if (event.replyId !== eventToSend.id) return;
|
||||||
|
|
||||||
|
if (event.payload.type === 'prompt_form_response') {
|
||||||
|
const { done, values } = event.payload as PromptFormResponse;
|
||||||
|
if (done) {
|
||||||
|
// Final response — resolve the promise and clean up
|
||||||
|
this.#appToPluginEvents.unlisten(cb);
|
||||||
|
this.#pendingDynamicForms.delete(eventToSend.id);
|
||||||
|
resolve({ values } as PromptFormResponse);
|
||||||
|
} else {
|
||||||
|
// Intermediate value change — resolve dynamic inputs and send back
|
||||||
|
// Skip empty values (fired on initial mount before user interaction)
|
||||||
|
const storedInputs = this.#pendingDynamicForms.get(eventToSend.id);
|
||||||
|
if (storedInputs && values && Object.keys(values).length > 0) {
|
||||||
|
const ctx = this.#newCtx(context);
|
||||||
|
const callArgs: CallPromptFormDynamicArgs = { values };
|
||||||
|
applyDynamicFormInput(ctx, storedInputs, callArgs)
|
||||||
|
.then((resolvedInputs) => {
|
||||||
|
const stripped = stripDynamicCallbacks(resolvedInputs);
|
||||||
|
this.#sendPayload(
|
||||||
|
context,
|
||||||
|
{ type: 'prompt_form_request', ...args, inputs: stripped },
|
||||||
|
eventToSend.id,
|
||||||
|
);
|
||||||
|
})
|
||||||
|
.catch((err) => {
|
||||||
|
console.error('Failed to resolve dynamic form inputs', err);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
};
|
||||||
|
this.#appToPluginEvents.listen(cb);
|
||||||
|
|
||||||
|
// Send the initial event after we start listening (to prevent race)
|
||||||
|
this.#sendEvent(eventToSend);
|
||||||
});
|
});
|
||||||
|
|
||||||
return reply.values;
|
return reply.values;
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
@@ -906,6 +970,17 @@ export class PluginInstance {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function stripDynamicCallbacks(inputs: { dynamic?: unknown }[]): FormInput[] {
|
||||||
|
return inputs.map((input) => {
|
||||||
|
// biome-ignore lint/suspicious/noExplicitAny: stripping dynamic from union type
|
||||||
|
const { dynamic, ...rest } = input as any;
|
||||||
|
if ('inputs' in rest && Array.isArray(rest.inputs)) {
|
||||||
|
rest.inputs = stripDynamicCallbacks(rest.inputs);
|
||||||
|
}
|
||||||
|
return rest as FormInput;
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
function genId(len = 5): string {
|
function genId(len = 5): string {
|
||||||
const alphabet = '01234567890abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ';
|
const alphabet = '01234567890abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ';
|
||||||
let id = '';
|
let id = '';
|
||||||
|
|||||||
@@ -1,9 +1,21 @@
|
|||||||
import type { Context, DynamicAuthenticationArg, DynamicTemplateFunctionArg } from '@yaakapp/api';
|
import type {
|
||||||
|
CallPromptFormDynamicArgs,
|
||||||
|
Context,
|
||||||
|
DynamicAuthenticationArg,
|
||||||
|
DynamicPromptFormArg,
|
||||||
|
DynamicTemplateFunctionArg,
|
||||||
|
} from '@yaakapp/api';
|
||||||
import type {
|
import type {
|
||||||
CallHttpAuthenticationActionArgs,
|
CallHttpAuthenticationActionArgs,
|
||||||
CallTemplateFunctionArgs,
|
CallTemplateFunctionArgs,
|
||||||
} from '@yaakapp-internal/plugins';
|
} from '@yaakapp-internal/plugins';
|
||||||
|
|
||||||
|
type AnyDynamicArg = DynamicTemplateFunctionArg | DynamicAuthenticationArg | DynamicPromptFormArg;
|
||||||
|
type AnyCallArgs =
|
||||||
|
| CallTemplateFunctionArgs
|
||||||
|
| CallHttpAuthenticationActionArgs
|
||||||
|
| CallPromptFormDynamicArgs;
|
||||||
|
|
||||||
export async function applyDynamicFormInput(
|
export async function applyDynamicFormInput(
|
||||||
ctx: Context,
|
ctx: Context,
|
||||||
args: DynamicTemplateFunctionArg[],
|
args: DynamicTemplateFunctionArg[],
|
||||||
@@ -18,30 +30,40 @@ export async function applyDynamicFormInput(
|
|||||||
|
|
||||||
export async function applyDynamicFormInput(
|
export async function applyDynamicFormInput(
|
||||||
ctx: Context,
|
ctx: Context,
|
||||||
args: (DynamicTemplateFunctionArg | DynamicAuthenticationArg)[],
|
args: DynamicPromptFormArg[],
|
||||||
callArgs: CallTemplateFunctionArgs | CallHttpAuthenticationActionArgs,
|
callArgs: CallPromptFormDynamicArgs,
|
||||||
): Promise<(DynamicTemplateFunctionArg | DynamicAuthenticationArg)[]> {
|
): Promise<DynamicPromptFormArg[]>;
|
||||||
const resolvedArgs: (DynamicTemplateFunctionArg | DynamicAuthenticationArg)[] = [];
|
|
||||||
|
export async function applyDynamicFormInput(
|
||||||
|
ctx: Context,
|
||||||
|
args: AnyDynamicArg[],
|
||||||
|
callArgs: AnyCallArgs,
|
||||||
|
): Promise<AnyDynamicArg[]> {
|
||||||
|
const resolvedArgs: AnyDynamicArg[] = [];
|
||||||
for (const { dynamic, ...arg } of args) {
|
for (const { dynamic, ...arg } of args) {
|
||||||
const dynamicResult =
|
const dynamicResult =
|
||||||
typeof dynamic === 'function'
|
typeof dynamic === 'function'
|
||||||
? await dynamic(
|
? await dynamic(
|
||||||
ctx,
|
ctx,
|
||||||
callArgs as CallTemplateFunctionArgs & CallHttpAuthenticationActionArgs,
|
callArgs as CallTemplateFunctionArgs &
|
||||||
|
CallHttpAuthenticationActionArgs &
|
||||||
|
CallPromptFormDynamicArgs,
|
||||||
)
|
)
|
||||||
: undefined;
|
: undefined;
|
||||||
|
|
||||||
const newArg = {
|
const newArg = {
|
||||||
...arg,
|
...arg,
|
||||||
...dynamicResult,
|
...dynamicResult,
|
||||||
} as DynamicTemplateFunctionArg | DynamicAuthenticationArg;
|
} as AnyDynamicArg;
|
||||||
|
|
||||||
if ('inputs' in newArg && Array.isArray(newArg.inputs)) {
|
if ('inputs' in newArg && Array.isArray(newArg.inputs)) {
|
||||||
try {
|
try {
|
||||||
newArg.inputs = await applyDynamicFormInput(
|
newArg.inputs = await applyDynamicFormInput(
|
||||||
ctx,
|
ctx,
|
||||||
newArg.inputs as DynamicTemplateFunctionArg[],
|
newArg.inputs as DynamicTemplateFunctionArg[],
|
||||||
callArgs as CallTemplateFunctionArgs & CallHttpAuthenticationActionArgs,
|
callArgs as CallTemplateFunctionArgs &
|
||||||
|
CallHttpAuthenticationActionArgs &
|
||||||
|
CallPromptFormDynamicArgs,
|
||||||
);
|
);
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
console.error('Failed to apply dynamic form input', e);
|
console.error('Failed to apply dynamic form input', e);
|
||||||
|
|||||||
45
plugins-external/httpsnippet/README.md
Normal file
45
plugins-external/httpsnippet/README.md
Normal file
@@ -0,0 +1,45 @@
|
|||||||
|
# Yaak HTTP Snippet Plugin
|
||||||
|
|
||||||
|
Generate code snippets for HTTP requests in various languages and frameworks,
|
||||||
|
powered by [@readme/httpsnippet](https://github.com/readmeio/httpsnippet).
|
||||||
|
|
||||||
|

|
||||||
|
|
||||||
|
## How It Works
|
||||||
|
|
||||||
|
Right-click any HTTP request (or use the `...` menu) and select **Generate Code Snippet**.
|
||||||
|
A dialog lets you pick a language and library, with a live preview of the generated code.
|
||||||
|
Click **Copy to Clipboard** to copy the snippet. Your language and library selections are
|
||||||
|
remembered for next time.
|
||||||
|
|
||||||
|
## Supported Languages
|
||||||
|
|
||||||
|
Each language supports one or more libraries:
|
||||||
|
|
||||||
|
| Language | Libraries |
|
||||||
|
|---|---|
|
||||||
|
| C | libcurl |
|
||||||
|
| Clojure | clj-http |
|
||||||
|
| C# | HttpClient, RestSharp |
|
||||||
|
| Go | Native |
|
||||||
|
| HTTP | HTTP/1.1 |
|
||||||
|
| Java | AsyncHttp, NetHttp, OkHttp, Unirest |
|
||||||
|
| JavaScript | Axios, fetch, jQuery, XHR |
|
||||||
|
| Kotlin | OkHttp |
|
||||||
|
| Node.js | Axios, fetch, HTTP, Request, Unirest |
|
||||||
|
| Objective-C | NSURLSession |
|
||||||
|
| OCaml | CoHTTP |
|
||||||
|
| PHP | cURL, Guzzle, HTTP v1, HTTP v2 |
|
||||||
|
| PowerShell | Invoke-WebRequest, RestMethod |
|
||||||
|
| Python | http.client, Requests |
|
||||||
|
| R | httr |
|
||||||
|
| Ruby | Native |
|
||||||
|
| Shell | cURL, HTTPie, Wget |
|
||||||
|
| Swift | URLSession |
|
||||||
|
|
||||||
|
## Features
|
||||||
|
|
||||||
|
- Renders template variables before generating snippets, so the output reflects real values
|
||||||
|
- Supports all body types: JSON, form-urlencoded, multipart, GraphQL, and raw text
|
||||||
|
- Includes authentication headers (Basic, Bearer, and API Key)
|
||||||
|
- Includes query parameters and custom headers
|
||||||
24
plugins-external/httpsnippet/package.json
Normal file
24
plugins-external/httpsnippet/package.json
Normal file
@@ -0,0 +1,24 @@
|
|||||||
|
{
|
||||||
|
"name": "@yaak/httpsnippet",
|
||||||
|
"private": true,
|
||||||
|
"version": "1.0.3",
|
||||||
|
"displayName": "HTTP Snippet",
|
||||||
|
"description": "Generate code snippets for HTTP requests in various languages and frameworks",
|
||||||
|
"minYaakVersion": "2026.2.0-beta.10",
|
||||||
|
"repository": {
|
||||||
|
"type": "git",
|
||||||
|
"url": "https://github.com/mountain-loop/yaak.git",
|
||||||
|
"directory": "plugins-external/httpsnippet"
|
||||||
|
},
|
||||||
|
"scripts": {
|
||||||
|
"build": "yaakcli build",
|
||||||
|
"dev": "yaakcli dev"
|
||||||
|
},
|
||||||
|
"dependencies": {
|
||||||
|
"@readme/httpsnippet": "^11.0.0"
|
||||||
|
},
|
||||||
|
"devDependencies": {
|
||||||
|
"@types/node": "^22.0.0",
|
||||||
|
"typescript": "^5.9.3"
|
||||||
|
}
|
||||||
|
}
|
||||||
314
plugins-external/httpsnippet/src/index.ts
Normal file
314
plugins-external/httpsnippet/src/index.ts
Normal file
@@ -0,0 +1,314 @@
|
|||||||
|
import { availableTargets, type HarRequest, HTTPSnippet } from '@readme/httpsnippet';
|
||||||
|
import type { EditorLanguage, HttpRequest, PluginDefinition } from '@yaakapp/api';
|
||||||
|
|
||||||
|
// Get all available targets and build select options
|
||||||
|
const targets = availableTargets();
|
||||||
|
|
||||||
|
// Targets to exclude from the language list
|
||||||
|
const excludedTargets = new Set(['json']);
|
||||||
|
|
||||||
|
// Build language (target) options
|
||||||
|
const languageOptions = targets
|
||||||
|
.filter((target) => !excludedTargets.has(target.key))
|
||||||
|
.map((target) => ({
|
||||||
|
label: target.title,
|
||||||
|
value: target.key,
|
||||||
|
}));
|
||||||
|
|
||||||
|
// Preferred clients per target (shown first in the list)
|
||||||
|
const preferredClients: Record<string, string> = {
|
||||||
|
javascript: 'fetch',
|
||||||
|
node: 'fetch',
|
||||||
|
};
|
||||||
|
|
||||||
|
// Get client options for a given target key
|
||||||
|
function getClientOptions(targetKey: string) {
|
||||||
|
const target = targets.find((t) => t.key === targetKey);
|
||||||
|
if (!target) return [];
|
||||||
|
const preferred = preferredClients[targetKey];
|
||||||
|
return target.clients
|
||||||
|
.map((client) => ({
|
||||||
|
label: client.title,
|
||||||
|
value: client.key,
|
||||||
|
}))
|
||||||
|
.sort((a, b) => {
|
||||||
|
if (a.value === preferred) return -1;
|
||||||
|
if (b.value === preferred) return 1;
|
||||||
|
return 0;
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
// Get default client for a target
|
||||||
|
function getDefaultClient(targetKey: string): string {
|
||||||
|
const options = getClientOptions(targetKey);
|
||||||
|
return options[0]?.value ?? '';
|
||||||
|
}
|
||||||
|
|
||||||
|
// Defaults
|
||||||
|
const defaultTarget = 'javascript';
|
||||||
|
|
||||||
|
// Map httpsnippet target key to editor language for syntax highlighting
|
||||||
|
const editorLanguageMap: Record<string, EditorLanguage> = {
|
||||||
|
c: 'c',
|
||||||
|
clojure: 'clojure',
|
||||||
|
csharp: 'csharp',
|
||||||
|
go: 'go',
|
||||||
|
http: 'http',
|
||||||
|
java: 'java',
|
||||||
|
javascript: 'javascript',
|
||||||
|
kotlin: 'kotlin',
|
||||||
|
node: 'javascript',
|
||||||
|
objc: 'objective_c',
|
||||||
|
ocaml: 'ocaml',
|
||||||
|
php: 'php',
|
||||||
|
powershell: 'powershell',
|
||||||
|
python: 'python',
|
||||||
|
r: 'r',
|
||||||
|
ruby: 'ruby',
|
||||||
|
shell: 'shell',
|
||||||
|
swift: 'swift',
|
||||||
|
};
|
||||||
|
|
||||||
|
function getEditorLanguage(targetKey: string): EditorLanguage {
|
||||||
|
return editorLanguageMap[targetKey] ?? 'text';
|
||||||
|
}
|
||||||
|
|
||||||
|
// Convert Yaak HttpRequest to HAR format
|
||||||
|
function toHarRequest(request: Partial<HttpRequest>) {
|
||||||
|
// Build URL with query parameters
|
||||||
|
let finalUrl = request.url || '';
|
||||||
|
const urlParams = (request.urlParameters ?? []).filter((p) => p.enabled !== false && !!p.name);
|
||||||
|
if (urlParams.length > 0) {
|
||||||
|
const [base, hash] = finalUrl.split('#');
|
||||||
|
const separator = base?.includes('?') ? '&' : '?';
|
||||||
|
const queryString = urlParams
|
||||||
|
.map((p) => `${encodeURIComponent(p.name)}=${encodeURIComponent(p.value)}`)
|
||||||
|
.join('&');
|
||||||
|
finalUrl = base + separator + queryString + (hash ? `#${hash}` : '');
|
||||||
|
}
|
||||||
|
|
||||||
|
// Build headers array
|
||||||
|
const headers: Array<{ name: string; value: string }> = (request.headers ?? [])
|
||||||
|
.filter((h) => h.enabled !== false && !!h.name)
|
||||||
|
.map((h) => ({ name: h.name, value: h.value }));
|
||||||
|
|
||||||
|
// Handle authentication
|
||||||
|
if (request.authentication?.disabled !== true) {
|
||||||
|
if (request.authenticationType === 'basic') {
|
||||||
|
const credentials = btoa(
|
||||||
|
`${request.authentication?.username ?? ''}:${request.authentication?.password ?? ''}`,
|
||||||
|
);
|
||||||
|
headers.push({ name: 'Authorization', value: `Basic ${credentials}` });
|
||||||
|
} else if (request.authenticationType === 'bearer') {
|
||||||
|
const prefix = request.authentication?.prefix ?? 'Bearer';
|
||||||
|
const token = request.authentication?.token ?? '';
|
||||||
|
headers.push({ name: 'Authorization', value: `${prefix} ${token}`.trim() });
|
||||||
|
} else if (request.authenticationType === 'apikey') {
|
||||||
|
if (request.authentication?.location === 'header') {
|
||||||
|
headers.push({
|
||||||
|
name: request.authentication?.key ?? 'X-Api-Key',
|
||||||
|
value: request.authentication?.value ?? '',
|
||||||
|
});
|
||||||
|
} else if (request.authentication?.location === 'query') {
|
||||||
|
const sep = finalUrl.includes('?') ? '&' : '?';
|
||||||
|
finalUrl = [
|
||||||
|
finalUrl,
|
||||||
|
sep,
|
||||||
|
encodeURIComponent(request.authentication?.key ?? 'token'),
|
||||||
|
'=',
|
||||||
|
encodeURIComponent(request.authentication?.value ?? ''),
|
||||||
|
].join('');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Build HAR request object
|
||||||
|
const har: Record<string, unknown> = {
|
||||||
|
method: request.method || 'GET',
|
||||||
|
url: finalUrl,
|
||||||
|
headers,
|
||||||
|
};
|
||||||
|
|
||||||
|
// Handle request body
|
||||||
|
const bodyType = request.bodyType ?? 'none';
|
||||||
|
if (bodyType !== 'none' && request.body) {
|
||||||
|
if (bodyType === 'application/x-www-form-urlencoded' && Array.isArray(request.body.form)) {
|
||||||
|
const params = request.body.form
|
||||||
|
.filter((p: { enabled?: boolean; name?: string }) => p.enabled !== false && !!p.name)
|
||||||
|
.map((p: { name: string; value: string }) => ({ name: p.name, value: p.value }));
|
||||||
|
har.postData = {
|
||||||
|
mimeType: 'application/x-www-form-urlencoded',
|
||||||
|
params,
|
||||||
|
};
|
||||||
|
} else if (bodyType === 'multipart/form-data' && Array.isArray(request.body.form)) {
|
||||||
|
const params = request.body.form
|
||||||
|
.filter((p: { enabled?: boolean; name?: string }) => p.enabled !== false && !!p.name)
|
||||||
|
.map((p: { name: string; value: string; file?: string; contentType?: string }) => {
|
||||||
|
const param: Record<string, string> = { name: p.name, value: p.value || '' };
|
||||||
|
if (p.file) param.fileName = p.file;
|
||||||
|
if (p.contentType) param.contentType = p.contentType;
|
||||||
|
return param;
|
||||||
|
});
|
||||||
|
har.postData = {
|
||||||
|
mimeType: 'multipart/form-data',
|
||||||
|
params,
|
||||||
|
};
|
||||||
|
} else if (bodyType === 'graphql' && typeof request.body.query === 'string') {
|
||||||
|
const body = {
|
||||||
|
query: request.body.query || '',
|
||||||
|
variables: maybeParseJSON(request.body.variables, undefined),
|
||||||
|
};
|
||||||
|
har.postData = {
|
||||||
|
mimeType: 'application/json',
|
||||||
|
text: JSON.stringify(body),
|
||||||
|
};
|
||||||
|
} else if (typeof request.body.text === 'string') {
|
||||||
|
har.postData = {
|
||||||
|
mimeType: bodyType,
|
||||||
|
text: request.body.text,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return har;
|
||||||
|
}
|
||||||
|
|
||||||
|
function maybeParseJSON<T>(v: unknown, fallback: T): T | unknown {
|
||||||
|
if (typeof v !== 'string') return fallback;
|
||||||
|
try {
|
||||||
|
return JSON.parse(v);
|
||||||
|
} catch {
|
||||||
|
return fallback;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
export const plugin: PluginDefinition = {
|
||||||
|
httpRequestActions: [
|
||||||
|
{
|
||||||
|
label: 'Generate Code Snippet',
|
||||||
|
icon: 'copy',
|
||||||
|
async onSelect(ctx, args) {
|
||||||
|
// Render the request with variables resolved
|
||||||
|
const renderedRequest = await ctx.httpRequest.render({
|
||||||
|
httpRequest: args.httpRequest,
|
||||||
|
purpose: 'send',
|
||||||
|
});
|
||||||
|
|
||||||
|
// Convert to HAR format
|
||||||
|
const harRequest = toHarRequest(renderedRequest) as HarRequest;
|
||||||
|
|
||||||
|
// Get previously selected language or use defaults
|
||||||
|
const storedTarget = await ctx.store.get<string>('selectedTarget');
|
||||||
|
const initialTarget = storedTarget || defaultTarget;
|
||||||
|
const storedClient = await ctx.store.get<string>(`selectedClient:${initialTarget}`);
|
||||||
|
const initialClient = storedClient || getDefaultClient(initialTarget);
|
||||||
|
|
||||||
|
// Create snippet generator
|
||||||
|
const snippet = new HTTPSnippet(harRequest);
|
||||||
|
const generateSnippet = (target: string, client: string): string => {
|
||||||
|
const result = snippet.convert(target as any, client);
|
||||||
|
return (Array.isArray(result) ? result.join('\n') : result || '').replace(/\r\n/g, '\n');
|
||||||
|
};
|
||||||
|
|
||||||
|
// Generate initial code preview
|
||||||
|
let initialCode = '';
|
||||||
|
try {
|
||||||
|
initialCode = generateSnippet(initialTarget, initialClient);
|
||||||
|
} catch {
|
||||||
|
initialCode = '// Error generating snippet';
|
||||||
|
}
|
||||||
|
|
||||||
|
// Show dialog with language/library selectors and code preview
|
||||||
|
const result = await ctx.prompt.form({
|
||||||
|
id: 'httpsnippet',
|
||||||
|
title: 'Generate Code Snippet',
|
||||||
|
confirmText: 'Copy to Clipboard',
|
||||||
|
cancelText: 'Cancel',
|
||||||
|
size: 'md',
|
||||||
|
inputs: [
|
||||||
|
{
|
||||||
|
type: 'h_stack',
|
||||||
|
inputs: [
|
||||||
|
{
|
||||||
|
type: 'select',
|
||||||
|
name: 'target',
|
||||||
|
label: 'Language',
|
||||||
|
defaultValue: initialTarget,
|
||||||
|
options: languageOptions,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
type: 'select',
|
||||||
|
name: `client-${initialTarget}`,
|
||||||
|
label: 'Library',
|
||||||
|
defaultValue: initialClient,
|
||||||
|
options: getClientOptions(initialTarget),
|
||||||
|
dynamic(_ctx, { values }) {
|
||||||
|
const targetKey = String(values.target || defaultTarget);
|
||||||
|
const options = getClientOptions(targetKey);
|
||||||
|
return {
|
||||||
|
name: `client-${targetKey}`,
|
||||||
|
options,
|
||||||
|
defaultValue: options[0]?.value ?? '',
|
||||||
|
};
|
||||||
|
},
|
||||||
|
},
|
||||||
|
],
|
||||||
|
},
|
||||||
|
{
|
||||||
|
type: 'editor',
|
||||||
|
name: 'code',
|
||||||
|
label: 'Preview',
|
||||||
|
language: getEditorLanguage(initialTarget),
|
||||||
|
defaultValue: initialCode,
|
||||||
|
readOnly: true,
|
||||||
|
rows: 15,
|
||||||
|
dynamic(_ctx, { values }) {
|
||||||
|
const targetKey = String(values.target || defaultTarget);
|
||||||
|
const clientKey = String(
|
||||||
|
values[`client-${targetKey}`] || getDefaultClient(targetKey),
|
||||||
|
);
|
||||||
|
let code: string;
|
||||||
|
try {
|
||||||
|
code = generateSnippet(targetKey, clientKey);
|
||||||
|
} catch {
|
||||||
|
code = '// Error generating snippet';
|
||||||
|
}
|
||||||
|
return {
|
||||||
|
defaultValue: code,
|
||||||
|
language: getEditorLanguage(targetKey),
|
||||||
|
};
|
||||||
|
},
|
||||||
|
},
|
||||||
|
],
|
||||||
|
});
|
||||||
|
|
||||||
|
if (result) {
|
||||||
|
// Store the selected language and library for next time
|
||||||
|
const selectedTarget = String(result.target || initialTarget);
|
||||||
|
const selectedClient = String(
|
||||||
|
result[`client-${selectedTarget}`] || getDefaultClient(selectedTarget),
|
||||||
|
);
|
||||||
|
await ctx.store.set('selectedTarget', selectedTarget);
|
||||||
|
await ctx.store.set(`selectedClient:${selectedTarget}`, selectedClient);
|
||||||
|
|
||||||
|
// Generate snippet for the selected language
|
||||||
|
try {
|
||||||
|
const codeText = generateSnippet(selectedTarget, selectedClient);
|
||||||
|
await ctx.clipboard.copyText(codeText);
|
||||||
|
await ctx.toast.show({
|
||||||
|
message: 'Code snippet copied to clipboard',
|
||||||
|
icon: 'copy',
|
||||||
|
color: 'success',
|
||||||
|
});
|
||||||
|
} catch (err) {
|
||||||
|
await ctx.toast.show({
|
||||||
|
message: `Failed to generate snippet: ${err}`,
|
||||||
|
icon: 'alert_triangle',
|
||||||
|
color: 'danger',
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
},
|
||||||
|
],
|
||||||
|
};
|
||||||
@@ -1,10 +1,10 @@
|
|||||||
{
|
{
|
||||||
"name": "@yaak/mcp-server",
|
"name": "@yaak/mcp-server",
|
||||||
"private": true,
|
"private": true,
|
||||||
"version": "0.1.7",
|
"version": "0.2.1",
|
||||||
"displayName": "MCP Server",
|
"displayName": "MCP Server",
|
||||||
"description": "Expose Yaak functionality via Model Context Protocol",
|
"description": "Expose Yaak functionality via Model Context Protocol",
|
||||||
"minYaakVersion": "2025.10.0-beta.6",
|
"minYaakVersion": "2026.1.0",
|
||||||
"repository": {
|
"repository": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/mountain-loop/yaak.git",
|
"url": "https://github.com/mountain-loop/yaak.git",
|
||||||
@@ -17,7 +17,7 @@
|
|||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@hono/mcp": "^0.2.3",
|
"@hono/mcp": "^0.2.3",
|
||||||
"@hono/node-server": "^1.19.7",
|
"@hono/node-server": "^1.19.7",
|
||||||
"@modelcontextprotocol/sdk": "^1.25.2",
|
"@modelcontextprotocol/sdk": "^1.26.0",
|
||||||
"hono": "^4.11.7",
|
"hono": "^4.11.7",
|
||||||
"zod": "^3.25.76"
|
"zod": "^3.25.76"
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -10,7 +10,7 @@ export const plugin: PluginDefinition = {
|
|||||||
async onSelect(ctx, args) {
|
async onSelect(ctx, args) {
|
||||||
const rendered_request = await ctx.httpRequest.render({
|
const rendered_request = await ctx.httpRequest.render({
|
||||||
httpRequest: args.httpRequest,
|
httpRequest: args.httpRequest,
|
||||||
purpose: 'preview',
|
purpose: 'send',
|
||||||
});
|
});
|
||||||
const data = await convertToCurl(rendered_request);
|
const data = await convertToCurl(rendered_request);
|
||||||
await ctx.clipboard.copyText(data);
|
await ctx.clipboard.copyText(data);
|
||||||
|
|||||||
@@ -55,6 +55,7 @@ const requestArg: FormInput = {
|
|||||||
type: 'http_request',
|
type: 'http_request',
|
||||||
name: 'request',
|
name: 'request',
|
||||||
label: 'Request',
|
label: 'Request',
|
||||||
|
defaultValue: '', // Make it not select the active one by default
|
||||||
};
|
};
|
||||||
|
|
||||||
export const plugin: PluginDefinition = {
|
export const plugin: PluginDefinition = {
|
||||||
|
|||||||
@@ -317,7 +317,7 @@ function TextArg({
|
|||||||
autocompleteFunctions,
|
autocompleteFunctions,
|
||||||
autocompleteVariables,
|
autocompleteVariables,
|
||||||
};
|
};
|
||||||
if (autocompleteVariables || autocompleteFunctions) {
|
if (autocompleteVariables || autocompleteFunctions || arg.completionOptions) {
|
||||||
return <Input {...props} />;
|
return <Input {...props} />;
|
||||||
}
|
}
|
||||||
return <PlainInput {...props} />;
|
return <PlainInput {...props} />;
|
||||||
@@ -360,8 +360,9 @@ function EditorArg({
|
|||||||
className={classNames(
|
className={classNames(
|
||||||
'border border-border rounded-md overflow-hidden px-2 py-1',
|
'border border-border rounded-md overflow-hidden px-2 py-1',
|
||||||
'focus-within:border-border-focus',
|
'focus-within:border-border-focus',
|
||||||
'max-h-[10rem]', // So it doesn't take up too much space
|
!arg.rows && 'max-h-[10rem]', // So it doesn't take up too much space
|
||||||
)}
|
)}
|
||||||
|
style={arg.rows ? { height: `${arg.rows * 1.4 + 0.75}rem` } : undefined}
|
||||||
>
|
>
|
||||||
<Editor
|
<Editor
|
||||||
id={id}
|
id={id}
|
||||||
|
|||||||
@@ -10,12 +10,16 @@ import { useEnvironmentsBreakdown } from '../hooks/useEnvironmentsBreakdown';
|
|||||||
import { useHeadersTab } from '../hooks/useHeadersTab';
|
import { useHeadersTab } from '../hooks/useHeadersTab';
|
||||||
import { useInheritedHeaders } from '../hooks/useInheritedHeaders';
|
import { useInheritedHeaders } from '../hooks/useInheritedHeaders';
|
||||||
import { useModelAncestors } from '../hooks/useModelAncestors';
|
import { useModelAncestors } from '../hooks/useModelAncestors';
|
||||||
|
import { deleteModelWithConfirm } from '../lib/deleteModelWithConfirm';
|
||||||
|
import { hideDialog } from '../lib/dialog';
|
||||||
|
import { CopyIconButton } from './CopyIconButton';
|
||||||
import { Button } from './core/Button';
|
import { Button } from './core/Button';
|
||||||
import { CountBadge } from './core/CountBadge';
|
import { CountBadge } from './core/CountBadge';
|
||||||
import { Icon } from './core/Icon';
|
import { Icon } from './core/Icon';
|
||||||
|
import { InlineCode } from './core/InlineCode';
|
||||||
import { Input } from './core/Input';
|
import { Input } from './core/Input';
|
||||||
import { Link } from './core/Link';
|
import { Link } from './core/Link';
|
||||||
import { VStack } from './core/Stacks';
|
import { HStack, VStack } from './core/Stacks';
|
||||||
import type { TabItem } from './core/Tabs/Tabs';
|
import type { TabItem } from './core/Tabs/Tabs';
|
||||||
import { TabContent, Tabs } from './core/Tabs/Tabs';
|
import { TabContent, Tabs } from './core/Tabs/Tabs';
|
||||||
import { EmptyStateText } from './EmptyStateText';
|
import { EmptyStateText } from './EmptyStateText';
|
||||||
@@ -117,7 +121,7 @@ export function FolderSettingsDialog({ folderId, tab }: Props) {
|
|||||||
<HttpAuthenticationEditor model={folder} />
|
<HttpAuthenticationEditor model={folder} />
|
||||||
</TabContent>
|
</TabContent>
|
||||||
<TabContent value={TAB_GENERAL} className="overflow-y-auto h-full px-4">
|
<TabContent value={TAB_GENERAL} className="overflow-y-auto h-full px-4">
|
||||||
<VStack space={3} className="pb-3 h-full">
|
<div className="grid grid-rows-[auto_minmax(0,1fr)_auto] gap-3 pb-3 h-full">
|
||||||
<Input
|
<Input
|
||||||
label="Folder Name"
|
label="Folder Name"
|
||||||
defaultValue={folder.name}
|
defaultValue={folder.name}
|
||||||
@@ -132,7 +136,32 @@ export function FolderSettingsDialog({ folderId, tab }: Props) {
|
|||||||
stateKey={`description.${folder.id}`}
|
stateKey={`description.${folder.id}`}
|
||||||
onChange={(description) => patchModel(folder, { description })}
|
onChange={(description) => patchModel(folder, { description })}
|
||||||
/>
|
/>
|
||||||
</VStack>
|
<HStack alignItems="center" justifyContent="between" className="w-full">
|
||||||
|
<Button
|
||||||
|
onClick={async () => {
|
||||||
|
const didDelete = await deleteModelWithConfirm(folder);
|
||||||
|
if (didDelete) {
|
||||||
|
hideDialog('folder-settings');
|
||||||
|
}
|
||||||
|
}}
|
||||||
|
color="danger"
|
||||||
|
variant="border"
|
||||||
|
size="xs"
|
||||||
|
>
|
||||||
|
Delete Folder
|
||||||
|
</Button>
|
||||||
|
<InlineCode className="flex gap-1 items-center text-primary pl-2.5">
|
||||||
|
{folder.id}
|
||||||
|
<CopyIconButton
|
||||||
|
className="opacity-70 !text-primary"
|
||||||
|
size="2xs"
|
||||||
|
iconSize="sm"
|
||||||
|
title="Copy folder ID"
|
||||||
|
text={folder.id}
|
||||||
|
/>
|
||||||
|
</InlineCode>
|
||||||
|
</HStack>
|
||||||
|
</div>
|
||||||
</TabContent>
|
</TabContent>
|
||||||
<TabContent value={TAB_HEADERS} className="overflow-y-auto h-full px-4">
|
<TabContent value={TAB_HEADERS} className="overflow-y-auto h-full px-4">
|
||||||
<HeadersEditor
|
<HeadersEditor
|
||||||
|
|||||||
@@ -239,7 +239,7 @@ export function HttpResponsePane({ style, className, activeRequestId }: Props) {
|
|||||||
<HttpMultipartViewer response={activeResponse} />
|
<HttpMultipartViewer response={activeResponse} />
|
||||||
) : mimeType?.match(/pdf/i) ? (
|
) : mimeType?.match(/pdf/i) ? (
|
||||||
<EnsureCompleteResponse response={activeResponse} Component={PdfViewer} />
|
<EnsureCompleteResponse response={activeResponse} Component={PdfViewer} />
|
||||||
) : mimeType?.match(/csv|tab-separated/i) ? (
|
) : mimeType?.match(/csv|tab-separated/i) && viewMode === 'pretty' ? (
|
||||||
<HttpCsvViewer className="pb-2" response={activeResponse} />
|
<HttpCsvViewer className="pb-2" response={activeResponse} />
|
||||||
) : (
|
) : (
|
||||||
<HTMLOrTextViewer
|
<HTMLOrTextViewer
|
||||||
|
|||||||
@@ -5,6 +5,7 @@ import { useMemo } from 'react';
|
|||||||
import { Overlay } from '../Overlay';
|
import { Overlay } from '../Overlay';
|
||||||
import { Heading } from './Heading';
|
import { Heading } from './Heading';
|
||||||
import { IconButton } from './IconButton';
|
import { IconButton } from './IconButton';
|
||||||
|
import { DialogSize } from '@yaakapp-internal/plugins';
|
||||||
|
|
||||||
export interface DialogProps {
|
export interface DialogProps {
|
||||||
children: ReactNode;
|
children: ReactNode;
|
||||||
@@ -14,7 +15,7 @@ export interface DialogProps {
|
|||||||
title?: ReactNode;
|
title?: ReactNode;
|
||||||
description?: ReactNode;
|
description?: ReactNode;
|
||||||
className?: string;
|
className?: string;
|
||||||
size?: 'sm' | 'md' | 'lg' | 'full' | 'dynamic';
|
size?: DialogSize;
|
||||||
hideX?: boolean;
|
hideX?: boolean;
|
||||||
noPadding?: boolean;
|
noPadding?: boolean;
|
||||||
noScroll?: boolean;
|
noScroll?: boolean;
|
||||||
|
|||||||
@@ -5,11 +5,14 @@ import {
|
|||||||
completionKeymap,
|
completionKeymap,
|
||||||
} from '@codemirror/autocomplete';
|
} from '@codemirror/autocomplete';
|
||||||
import { history, historyKeymap } from '@codemirror/commands';
|
import { history, historyKeymap } from '@codemirror/commands';
|
||||||
|
import { go } from '@codemirror/lang-go';
|
||||||
|
import { java } from '@codemirror/lang-java';
|
||||||
import { javascript } from '@codemirror/lang-javascript';
|
import { javascript } from '@codemirror/lang-javascript';
|
||||||
import { json } from '@codemirror/lang-json';
|
import { json } from '@codemirror/lang-json';
|
||||||
import { markdown } from '@codemirror/lang-markdown';
|
import { markdown } from '@codemirror/lang-markdown';
|
||||||
|
import { php } from '@codemirror/lang-php';
|
||||||
|
import { python } from '@codemirror/lang-python';
|
||||||
import { xml } from '@codemirror/lang-xml';
|
import { xml } from '@codemirror/lang-xml';
|
||||||
import type { LanguageSupport } from '@codemirror/language';
|
|
||||||
import {
|
import {
|
||||||
bracketMatching,
|
bracketMatching,
|
||||||
codeFolding,
|
codeFolding,
|
||||||
@@ -17,8 +20,19 @@ import {
|
|||||||
foldKeymap,
|
foldKeymap,
|
||||||
HighlightStyle,
|
HighlightStyle,
|
||||||
indentOnInput,
|
indentOnInput,
|
||||||
|
LanguageSupport,
|
||||||
|
StreamLanguage,
|
||||||
syntaxHighlighting,
|
syntaxHighlighting,
|
||||||
} from '@codemirror/language';
|
} from '@codemirror/language';
|
||||||
|
import { c, csharp, kotlin, objectiveC } from '@codemirror/legacy-modes/mode/clike';
|
||||||
|
import { clojure } from '@codemirror/legacy-modes/mode/clojure';
|
||||||
|
import { http } from '@codemirror/legacy-modes/mode/http';
|
||||||
|
import { oCaml } from '@codemirror/legacy-modes/mode/mllike';
|
||||||
|
import { powerShell } from '@codemirror/legacy-modes/mode/powershell';
|
||||||
|
import { r } from '@codemirror/legacy-modes/mode/r';
|
||||||
|
import { ruby } from '@codemirror/legacy-modes/mode/ruby';
|
||||||
|
import { shell } from '@codemirror/legacy-modes/mode/shell';
|
||||||
|
import { swift } from '@codemirror/legacy-modes/mode/swift';
|
||||||
import { linter, lintGutter, lintKeymap } from '@codemirror/lint';
|
import { linter, lintGutter, lintKeymap } from '@codemirror/lint';
|
||||||
|
|
||||||
import { search, searchKeymap } from '@codemirror/search';
|
import { search, searchKeymap } from '@codemirror/search';
|
||||||
@@ -83,6 +97,10 @@ const syntaxTheme = EditorView.theme({}, { dark: true });
|
|||||||
|
|
||||||
const closeBracketsExtensions: Extension = [closeBrackets(), keymap.of([...closeBracketsKeymap])];
|
const closeBracketsExtensions: Extension = [closeBrackets(), keymap.of([...closeBracketsKeymap])];
|
||||||
|
|
||||||
|
const legacyLang = (mode: Parameters<typeof StreamLanguage.define>[0]) => {
|
||||||
|
return () => new LanguageSupport(StreamLanguage.define(mode));
|
||||||
|
};
|
||||||
|
|
||||||
const syntaxExtensions: Record<
|
const syntaxExtensions: Record<
|
||||||
NonNullable<EditorProps['language']>,
|
NonNullable<EditorProps['language']>,
|
||||||
null | (() => LanguageSupport)
|
null | (() => LanguageSupport)
|
||||||
@@ -98,6 +116,22 @@ const syntaxExtensions: Record<
|
|||||||
text: text,
|
text: text,
|
||||||
timeline: timeline,
|
timeline: timeline,
|
||||||
markdown: markdown,
|
markdown: markdown,
|
||||||
|
c: legacyLang(c),
|
||||||
|
clojure: legacyLang(clojure),
|
||||||
|
csharp: legacyLang(csharp),
|
||||||
|
go: go,
|
||||||
|
http: legacyLang(http),
|
||||||
|
java: java,
|
||||||
|
kotlin: legacyLang(kotlin),
|
||||||
|
objective_c: legacyLang(objectiveC),
|
||||||
|
ocaml: legacyLang(oCaml),
|
||||||
|
php: php,
|
||||||
|
powershell: legacyLang(powerShell),
|
||||||
|
python: python,
|
||||||
|
r: legacyLang(r),
|
||||||
|
ruby: legacyLang(ruby),
|
||||||
|
shell: legacyLang(shell),
|
||||||
|
swift: legacyLang(swift),
|
||||||
};
|
};
|
||||||
|
|
||||||
const closeBracketsFor: (keyof typeof syntaxExtensions)[] = ['json', 'javascript', 'graphql'];
|
const closeBracketsFor: (keyof typeof syntaxExtensions)[] = ['json', 'javascript', 'graphql'];
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
import type { FormInput, JsonPrimitive } from '@yaakapp-internal/plugins';
|
import type { FormInput, JsonPrimitive } from '@yaakapp-internal/plugins';
|
||||||
import type { FormEvent } from 'react';
|
import type { FormEvent } from 'react';
|
||||||
import { useCallback, useRef, useState } from 'react';
|
import { useCallback, useEffect, useRef, useState } from 'react';
|
||||||
import { generateId } from '../../lib/generateId';
|
import { generateId } from '../../lib/generateId';
|
||||||
import { DynamicForm } from '../DynamicForm';
|
import { DynamicForm } from '../DynamicForm';
|
||||||
import { Button } from './Button';
|
import { Button } from './Button';
|
||||||
@@ -12,16 +12,21 @@ export interface PromptProps {
|
|||||||
onResult: (value: Record<string, JsonPrimitive> | null) => void;
|
onResult: (value: Record<string, JsonPrimitive> | null) => void;
|
||||||
confirmText?: string;
|
confirmText?: string;
|
||||||
cancelText?: string;
|
cancelText?: string;
|
||||||
|
onValuesChange?: (values: Record<string, JsonPrimitive>) => void;
|
||||||
|
onInputsUpdated?: (cb: (inputs: FormInput[]) => void) => void;
|
||||||
}
|
}
|
||||||
|
|
||||||
export function Prompt({
|
export function Prompt({
|
||||||
onCancel,
|
onCancel,
|
||||||
inputs,
|
inputs: initialInputs,
|
||||||
onResult,
|
onResult,
|
||||||
confirmText = 'Confirm',
|
confirmText = 'Confirm',
|
||||||
cancelText = 'Cancel',
|
cancelText = 'Cancel',
|
||||||
|
onValuesChange,
|
||||||
|
onInputsUpdated,
|
||||||
}: PromptProps) {
|
}: PromptProps) {
|
||||||
const [value, setValue] = useState<Record<string, JsonPrimitive>>({});
|
const [value, setValue] = useState<Record<string, JsonPrimitive>>({});
|
||||||
|
const [inputs, setInputs] = useState<FormInput[]>(initialInputs);
|
||||||
const handleSubmit = useCallback(
|
const handleSubmit = useCallback(
|
||||||
(e: FormEvent<HTMLFormElement>) => {
|
(e: FormEvent<HTMLFormElement>) => {
|
||||||
e.preventDefault();
|
e.preventDefault();
|
||||||
@@ -30,6 +35,16 @@ export function Prompt({
|
|||||||
[onResult, value],
|
[onResult, value],
|
||||||
);
|
);
|
||||||
|
|
||||||
|
// Register callback for external input updates (from plugin dynamic resolution)
|
||||||
|
useEffect(() => {
|
||||||
|
onInputsUpdated?.(setInputs);
|
||||||
|
}, [onInputsUpdated]);
|
||||||
|
|
||||||
|
// Notify of value changes for dynamic resolution
|
||||||
|
useEffect(() => {
|
||||||
|
onValuesChange?.(value);
|
||||||
|
}, [value, onValuesChange]);
|
||||||
|
|
||||||
const id = `prompt.form.${useRef(generateId()).current}`;
|
const id = `prompt.form.${useRef(generateId()).current}`;
|
||||||
|
|
||||||
return (
|
return (
|
||||||
|
|||||||
@@ -1,6 +1,12 @@
|
|||||||
import { emit } from '@tauri-apps/api/event';
|
import { emit } from '@tauri-apps/api/event';
|
||||||
import { openUrl } from '@tauri-apps/plugin-opener';
|
import { openUrl } from '@tauri-apps/plugin-opener';
|
||||||
import type { InternalEvent, ShowToastRequest } from '@yaakapp-internal/plugins';
|
import { debounce } from '@yaakapp-internal/lib';
|
||||||
|
import type {
|
||||||
|
FormInput,
|
||||||
|
InternalEvent,
|
||||||
|
JsonPrimitive,
|
||||||
|
ShowToastRequest,
|
||||||
|
} from '@yaakapp-internal/plugins';
|
||||||
import { updateAllPlugins } from '@yaakapp-internal/plugins';
|
import { updateAllPlugins } from '@yaakapp-internal/plugins';
|
||||||
import type {
|
import type {
|
||||||
PluginUpdateNotification,
|
PluginUpdateNotification,
|
||||||
@@ -32,6 +38,9 @@ export function initGlobalListeners() {
|
|||||||
|
|
||||||
listenToTauriEvent('settings', () => openSettings.mutate(null));
|
listenToTauriEvent('settings', () => openSettings.mutate(null));
|
||||||
|
|
||||||
|
// Track active dynamic form dialogs so follow-up input updates can reach them
|
||||||
|
const activeForms = new Map<string, (inputs: FormInput[]) => void>();
|
||||||
|
|
||||||
// Listen for plugin events
|
// Listen for plugin events
|
||||||
listenToTauriEvent<InternalEvent>('plugin_event', async ({ payload: event }) => {
|
listenToTauriEvent<InternalEvent>('plugin_event', async ({ payload: event }) => {
|
||||||
if (event.payload.type === 'prompt_text_request') {
|
if (event.payload.type === 'prompt_text_request') {
|
||||||
@@ -49,26 +58,47 @@ export function initGlobalListeners() {
|
|||||||
};
|
};
|
||||||
await emit(event.id, result);
|
await emit(event.id, result);
|
||||||
} else if (event.payload.type === 'prompt_form_request') {
|
} else if (event.payload.type === 'prompt_form_request') {
|
||||||
|
if (event.replyId != null) {
|
||||||
|
// Follow-up update from plugin runtime — update the active dialog's inputs
|
||||||
|
const updateInputs = activeForms.get(event.replyId);
|
||||||
|
if (updateInputs) {
|
||||||
|
updateInputs(event.payload.inputs);
|
||||||
|
}
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Initial request — show the dialog with bidirectional support
|
||||||
|
const emitFormResponse = (values: Record<string, JsonPrimitive> | null, done: boolean) => {
|
||||||
|
const result: InternalEvent = {
|
||||||
|
id: generateId(),
|
||||||
|
replyId: event.id,
|
||||||
|
pluginName: event.pluginName,
|
||||||
|
pluginRefId: event.pluginRefId,
|
||||||
|
context: event.context,
|
||||||
|
payload: {
|
||||||
|
type: 'prompt_form_response',
|
||||||
|
values,
|
||||||
|
done,
|
||||||
|
},
|
||||||
|
};
|
||||||
|
emit(event.id, result);
|
||||||
|
};
|
||||||
|
|
||||||
const values = await showPromptForm({
|
const values = await showPromptForm({
|
||||||
id: event.payload.id,
|
id: event.payload.id,
|
||||||
title: event.payload.title,
|
title: event.payload.title,
|
||||||
description: event.payload.description,
|
description: event.payload.description,
|
||||||
|
size: event.payload.size,
|
||||||
inputs: event.payload.inputs,
|
inputs: event.payload.inputs,
|
||||||
confirmText: event.payload.confirmText,
|
confirmText: event.payload.confirmText,
|
||||||
cancelText: event.payload.cancelText,
|
cancelText: event.payload.cancelText,
|
||||||
|
onValuesChange: debounce((values) => emitFormResponse(values, false), 150),
|
||||||
|
onInputsUpdated: (cb) => activeForms.set(event.id, cb),
|
||||||
});
|
});
|
||||||
const result: InternalEvent = {
|
|
||||||
id: generateId(),
|
// Clean up and send final response
|
||||||
replyId: event.id,
|
activeForms.delete(event.id);
|
||||||
pluginName: event.pluginName,
|
emitFormResponse(values, true);
|
||||||
pluginRefId: event.pluginRefId,
|
|
||||||
context: event.context,
|
|
||||||
payload: {
|
|
||||||
type: 'prompt_form_response',
|
|
||||||
values,
|
|
||||||
},
|
|
||||||
};
|
|
||||||
await emit(event.id, result);
|
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
@@ -1,21 +1,32 @@
|
|||||||
|
import type { FormInput, JsonPrimitive } from '@yaakapp-internal/plugins';
|
||||||
import type { DialogProps } from '../components/core/Dialog';
|
import type { DialogProps } from '../components/core/Dialog';
|
||||||
import type { PromptProps } from '../components/core/Prompt';
|
import type { PromptProps } from '../components/core/Prompt';
|
||||||
import { Prompt } from '../components/core/Prompt';
|
import { Prompt } from '../components/core/Prompt';
|
||||||
import { showDialog } from './dialog';
|
import { showDialog } from './dialog';
|
||||||
|
|
||||||
type FormArgs = Pick<DialogProps, 'title' | 'description'> &
|
type FormArgs = Pick<DialogProps, 'title' | 'description' | 'size'> &
|
||||||
Omit<PromptProps, 'onClose' | 'onCancel' | 'onResult'> & {
|
Omit<PromptProps, 'onClose' | 'onCancel' | 'onResult'> & {
|
||||||
id: string;
|
id: string;
|
||||||
|
onValuesChange?: (values: Record<string, JsonPrimitive>) => void;
|
||||||
|
onInputsUpdated?: (cb: (inputs: FormInput[]) => void) => void;
|
||||||
};
|
};
|
||||||
|
|
||||||
export async function showPromptForm({ id, title, description, ...props }: FormArgs) {
|
export async function showPromptForm({
|
||||||
|
id,
|
||||||
|
title,
|
||||||
|
description,
|
||||||
|
size,
|
||||||
|
onValuesChange,
|
||||||
|
onInputsUpdated,
|
||||||
|
...props
|
||||||
|
}: FormArgs) {
|
||||||
return new Promise((resolve: PromptProps['onResult']) => {
|
return new Promise((resolve: PromptProps['onResult']) => {
|
||||||
showDialog({
|
showDialog({
|
||||||
id,
|
id,
|
||||||
title,
|
title,
|
||||||
description,
|
description,
|
||||||
hideX: true,
|
hideX: true,
|
||||||
size: 'sm',
|
size: size ?? 'sm',
|
||||||
disableBackdropClose: true, // Prevent accidental dismisses
|
disableBackdropClose: true, // Prevent accidental dismisses
|
||||||
onClose: () => {
|
onClose: () => {
|
||||||
// Click backdrop, close, or escape
|
// Click backdrop, close, or escape
|
||||||
@@ -32,6 +43,8 @@ export async function showPromptForm({ id, title, description, ...props }: FormA
|
|||||||
resolve(v);
|
resolve(v);
|
||||||
hide();
|
hide();
|
||||||
},
|
},
|
||||||
|
onValuesChange,
|
||||||
|
onInputsUpdated,
|
||||||
...props,
|
...props,
|
||||||
}),
|
}),
|
||||||
});
|
});
|
||||||
|
|||||||
Reference in New Issue
Block a user