tests(cli): prevent request send test teardown hang (#408)

Fixes
https://yaak.app/feedback/posts/request-chaining-issue-on-cold-start

crates-cli/yaak-cli/tests/common/http_server.rs

@@ -1,9 +1,14 @@
 use std::io::{Read, Write};
-use std::net::TcpListener;
+use std::net::{SocketAddr, TcpListener, TcpStream};
+use std::sync::Arc;
+use std::sync::atomic::{AtomicBool, Ordering};
 use std::thread;
+use std::time::Duration;
 
 pub struct TestHttpServer {
     pub url: String,
+    addr: SocketAddr,
+    shutdown: Arc<AtomicBool>,
     handle: Option<thread::JoinHandle<()>>,
 }
 
@@ -12,29 +17,46 @@ impl TestHttpServer {
         let listener = TcpListener::bind("127.0.0.1:0").expect("Failed to bind test HTTP server");
         let addr = listener.local_addr().expect("Failed to get local addr");
         let url = format!("http://{addr}/test");
+        listener.set_nonblocking(true).expect("Failed to set test server listener nonblocking");
+
+        let shutdown = Arc::new(AtomicBool::new(false));
+        let shutdown_signal = Arc::clone(&shutdown);
         let body_bytes = body.as_bytes().to_vec();
 
         let handle = thread::spawn(move || {
-            if let Ok((mut stream, _)) = listener.accept() {
-                let mut request_buf = [0u8; 4096];
-                let _ = stream.read(&mut request_buf);
+            while !shutdown_signal.load(Ordering::Relaxed) {
+                match listener.accept() {
+                    Ok((mut stream, _)) => {
+                        let _ = stream.set_read_timeout(Some(Duration::from_secs(1)));
+                        let mut request_buf = [0u8; 4096];
+                        let _ = stream.read(&mut request_buf);
 
-                let response = format!(
-                    "HTTP/1.1 200 OK\r\nContent-Type: text/plain\r\nContent-Length: {}\r\nConnection: close\r\n\r\n",
-                    body_bytes.len()
-                );
-                let _ = stream.write_all(response.as_bytes());
-                let _ = stream.write_all(&body_bytes);
-                let _ = stream.flush();
+                        let response = format!(
+                            "HTTP/1.1 200 OK\r\nContent-Type: text/plain\r\nContent-Length: {}\r\nConnection: close\r\n\r\n",
+                            body_bytes.len()
+                        );
+                        let _ = stream.write_all(response.as_bytes());
+                        let _ = stream.write_all(&body_bytes);
+                        let _ = stream.flush();
+                        break;
+                    }
+                    Err(err) if err.kind() == std::io::ErrorKind::WouldBlock => {
+                        thread::sleep(Duration::from_millis(10));
+                    }
+                    Err(_) => break,
+                }
             }
         });
 
-        Self { url, handle: Some(handle) }
+        Self { url, addr, shutdown, handle: Some(handle) }
     }
 }
 
 impl Drop for TestHttpServer {
     fn drop(&mut self) {
+        self.shutdown.store(true, Ordering::Relaxed);
+        let _ = TcpStream::connect(self.addr);
+
         if let Some(handle) = self.handle.take() {
             let _ = handle.join();
         }

crates-tauri/yaak-app/src/plugin_events.rs

@@ -362,7 +362,7 @@ async fn handle_host_plugin_request<R: Runtime>(
                         workspace_id: http_request.workspace_id.clone(),
                         ..Default::default()
                     },
-                    &UpdateSource::Plugin,
+                    &UpdateSource::from_window_label(window.label()),
                     &blobs,
                 )?
             };

crates/yaak-http/src/manager.rs

@@ -36,7 +36,6 @@ impl HttpConnectionManager {
         connections.retain(|_, (_, last_used)| last_used.elapsed() <= self.ttl);
 
         if let Some((cached, last_used)) = connections.get_mut(&id) {
-            info!("Re-using HTTP client {id}");
             *last_used = Instant::now();
             return Ok(CachedClient {
                 client: cached.client.clone(),

crates/yaak-templates/pkg/yaak_templates.d.ts

@@ -1,5 +1,5 @@
 /* tslint:disable */
 /* eslint-disable */
-export function unescape_template(template: string): any;
-export function parse_template(template: string): any;
 export function escape_template(template: string): any;
+export function parse_template(template: string): any;
+export function unescape_template(template: string): any;

crates/yaak-templates/pkg/yaak_templates_bg.js

@@ -165,10 +165,10 @@ function takeFromExternrefTable0(idx) {
  * @param {string} template
  * @returns {any}
  */
-export function unescape_template(template) {
+export function escape_template(template) {
     const ptr0 = passStringToWasm0(template, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
     const len0 = WASM_VECTOR_LEN;
-    const ret = wasm.unescape_template(ptr0, len0);
+    const ret = wasm.escape_template(ptr0, len0);
     if (ret[2]) {
         throw takeFromExternrefTable0(ret[1]);
     }
@@ -193,10 +193,10 @@ export function parse_template(template) {
  * @param {string} template
  * @returns {any}
  */
-export function escape_template(template) {
+export function unescape_template(template) {
     const ptr0 = passStringToWasm0(template, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
     const len0 = WASM_VECTOR_LEN;
-    const ret = wasm.escape_template(ptr0, len0);
+    const ret = wasm.unescape_template(ptr0, len0);
     if (ret[2]) {
         throw takeFromExternrefTable0(ret[1]);
     }

crates/yaak-tls/src/lib.rs

@@ -273,6 +273,5 @@ pub fn find_client_certificate(
         });
     }
 
-    debug!("No matching client certificate found for {}", url_string);
     None
 }

package-lock.json

@@ -73,7 +73,7 @@
       "devDependencies": {
         "@biomejs/biome": "^2.3.13",
         "@tauri-apps/cli": "^2.9.6",
-        "@yaakapp/cli": "^0.4.0-beta.2",
+        "@yaakapp/cli": "^0.4.0",
         "dotenv-cli": "^11.0.0",
         "husky": "^9.1.7",
         "nodejs-file-downloader": "^4.13.0",
@@ -4326,9 +4326,9 @@
       "link": true
     },
     "node_modules/@yaakapp/cli": {
-      "version": "0.4.0-beta.2",
-      "resolved": "https://registry.npmjs.org/@yaakapp/cli/-/cli-0.4.0-beta.2.tgz",
-      "integrity": "sha512-UXPxTS9oWVCIr4rShC7HjcAX+gSmw/BQ5F1Xp3Rub3vY/G7+513JJsc1HhLGVZqFfOVRSMEKRxtF9/9okSyiHg==",
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/@yaakapp/cli/-/cli-0.4.0.tgz",
+      "integrity": "sha512-8xnu2oFWlgV+xeIAHMuEgsqX6Sxq4UYrSH2WbafwDLbSep6fxpO74tiBH7xp4wakt/7Bcy9a2Q5R9nkAc1ZUdA==",
       "dev": true,
       "hasInstallScript": true,
       "bin": {
@@ -4336,18 +4336,18 @@
         "yaakcli": "bin/cli.js"
       },
       "optionalDependencies": {
-        "@yaakapp/cli-darwin-arm64": "0.4.0-beta.2",
-        "@yaakapp/cli-darwin-x64": "0.4.0-beta.2",
-        "@yaakapp/cli-linux-arm64": "0.4.0-beta.2",
-        "@yaakapp/cli-linux-x64": "0.4.0-beta.2",
-        "@yaakapp/cli-win32-arm64": "0.4.0-beta.2",
-        "@yaakapp/cli-win32-x64": "0.4.0-beta.2"
+        "@yaakapp/cli-darwin-arm64": "0.4.0",
+        "@yaakapp/cli-darwin-x64": "0.4.0",
+        "@yaakapp/cli-linux-arm64": "0.4.0",
+        "@yaakapp/cli-linux-x64": "0.4.0",
+        "@yaakapp/cli-win32-arm64": "0.4.0",
+        "@yaakapp/cli-win32-x64": "0.4.0"
       }
     },
     "node_modules/@yaakapp/cli-darwin-arm64": {
-      "version": "0.4.0-beta.2",
-      "resolved": "https://registry.npmjs.org/@yaakapp/cli-darwin-arm64/-/cli-darwin-arm64-0.4.0-beta.2.tgz",
-      "integrity": "sha512-mqkyH5tIPRLs9JumP9ZmzjB5gIwmOL1yCDoJ1qVU8DIJ7mwlcQaPGYTK98pVdBcKOjofVakBTcpol9P8rBv4qw==",
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/@yaakapp/cli-darwin-arm64/-/cli-darwin-arm64-0.4.0.tgz",
+      "integrity": "sha512-bl8+VQNPMabXNGQCa7u6w0JGe3CmzYZPsGE8Q+5wGSxa3trGf1bmq/fMW5JXrMi1P7Laepnyad0TGGP/2C8uwQ==",
       "cpu": [
         "arm64"
       ],
@@ -4358,9 +4358,9 @@
       ]
     },
     "node_modules/@yaakapp/cli-darwin-x64": {
-      "version": "0.4.0-beta.2",
-      "resolved": "https://registry.npmjs.org/@yaakapp/cli-darwin-x64/-/cli-darwin-x64-0.4.0-beta.2.tgz",
-      "integrity": "sha512-QI/H2yUF8CkJq+cnRthoUWWTEJPH4QPA78FYcGjFRhvBaj1m2G/GlCA5NkTXm/fvIjNkQEODSihXrhU+zoSSCw==",
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/@yaakapp/cli-darwin-x64/-/cli-darwin-x64-0.4.0.tgz",
+      "integrity": "sha512-R+ETXNBWvmA3W88ZoTk/JtG/PZaUb85y3SwBgMbwcgdhBVwNS/g+DbCspcTFI5zs8Txsf5VuiFU+dW9M9olZ6A==",
       "cpu": [
         "x64"
       ],
@@ -4371,9 +4371,9 @@
       ]
     },
     "node_modules/@yaakapp/cli-linux-arm64": {
-      "version": "0.4.0-beta.2",
-      "resolved": "https://registry.npmjs.org/@yaakapp/cli-linux-arm64/-/cli-linux-arm64-0.4.0-beta.2.tgz",
-      "integrity": "sha512-nvAp97LkgRpqVHyMwDdpkzlKOWG2kJXezCLRZaRWaEpbnNuviSF+0yzCuFGZRHEEspj7B0TiM+sKGkpvjNlweA==",
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/@yaakapp/cli-linux-arm64/-/cli-linux-arm64-0.4.0.tgz",
+      "integrity": "sha512-Pf7VyQf4r85FsI0qYnnst7URQF8/RxSZZj79cXLai0FnN3fDiypX4CmHx765bJxgfQZlBvqVmvPAaMW/TeiJEQ==",
       "cpu": [
         "arm64"
       ],
@@ -4384,9 +4384,9 @@
       ]
     },
     "node_modules/@yaakapp/cli-linux-x64": {
-      "version": "0.4.0-beta.2",
-      "resolved": "https://registry.npmjs.org/@yaakapp/cli-linux-x64/-/cli-linux-x64-0.4.0-beta.2.tgz",
-      "integrity": "sha512-9/qAMNrtE9glxih3XWGfFssIJpQ4mHNUTuWYKroc0aZZUrunnCw3tX1tQtFDxy0QRIZcGlBeBRtgxuuBd2fYbg==",
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/@yaakapp/cli-linux-x64/-/cli-linux-x64-0.4.0.tgz",
+      "integrity": "sha512-bYWWfHAIW81A+ydJChjH1Qo3+aihz9gFLh7/9MOa6CJgnC6H3V5cnapmh50Hddt9l5ic02aA1FB8ORQOXxb01A==",
       "cpu": [
         "x64"
       ],
@@ -4397,9 +4397,9 @@
       ]
     },
     "node_modules/@yaakapp/cli-win32-arm64": {
-      "version": "0.4.0-beta.2",
-      "resolved": "https://registry.npmjs.org/@yaakapp/cli-win32-arm64/-/cli-win32-arm64-0.4.0-beta.2.tgz",
-      "integrity": "sha512-eM1zL+hl0y3NBLxWO90y9VyaFsAf0HAsECBWvhKhvEdd6KG4K1XzpXrC30cHQBGePIrCa/az8eSuvTde0Z2C/g==",
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/@yaakapp/cli-win32-arm64/-/cli-win32-arm64-0.4.0.tgz",
+      "integrity": "sha512-8X12xkyidyYZ5vtarZGFSYR6HJbUMFUsNxYPNQccnYJIY+soNkjJHOWDjaRvBzCbR8MLT9N04Y5PE/Jv20gXpA==",
       "cpu": [
         "arm64"
       ],
@@ -4410,9 +4410,9 @@
       ]
     },
     "node_modules/@yaakapp/cli-win32-x64": {
-      "version": "0.4.0-beta.2",
-      "resolved": "https://registry.npmjs.org/@yaakapp/cli-win32-x64/-/cli-win32-x64-0.4.0-beta.2.tgz",
-      "integrity": "sha512-ySdiK0h216EqURkM5KZoqbPTgbIX4eNK/IgrKwSazxRb369HOZYQ8X68as+VRxEL4NCMmWlQNdbBDuf+apg/mg==",
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/@yaakapp/cli-win32-x64/-/cli-win32-x64-0.4.0.tgz",
+      "integrity": "sha512-wansfrCCycFcFclowQQxfsNLIAyATyqnnbITED5gUfUrBf8NFHrG0sWVCWlXUhHU7YvpmqL7CsdtlMkIGiZCPQ==",
       "cpu": [
         "x64"
       ],

package.json

@@ -97,7 +97,7 @@
   "devDependencies": {
     "@biomejs/biome": "^2.3.13",
     "@tauri-apps/cli": "^2.9.6",
-    "@yaakapp/cli": "^0.4.0-beta.2",
+    "@yaakapp/cli": "^0.4.0",
     "dotenv-cli": "^11.0.0",
     "husky": "^9.1.7",
     "nodejs-file-downloader": "^4.13.0",

plugins/action-send-folder/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@yaak/action-send-folder",
   "displayName": "Send All",
-  "description": "Send all HTTP requests in a folder sequentially",
+  "description": "Send all HTTP requests in a folder sequentially in tree order",
   "repository": {
     "type": "git",
     "url": "https://github.com/mountain-loop/yaak.git",

plugins/action-send-folder/src/index.ts

@@ -14,22 +14,44 @@ export const plugin: PluginDefinition = {
           ctx.httpRequest.list(),
         ]);
 
-        // Build a set of all folder IDs that are descendants of the target folder
-        const folderIds = new Set<string>([targetFolder.id]);
-        const addDescendants = (parentId: string) => {
-          for (const folder of allFolders) {
-            if (folder.folderId === parentId && !folderIds.has(folder.id)) {
-              folderIds.add(folder.id);
-              addDescendants(folder.id);
+        // Build the send order to match tree ordering:
+        // sort siblings by sortPriority then updatedAt, and traverse folders depth-first.
+        const compareByOrder = (
+          a: Pick<typeof allFolders[number], 'sortPriority' | 'updatedAt'>,
+          b: Pick<typeof allFolders[number], 'sortPriority' | 'updatedAt'>,
+        ) => {
+          if (a.sortPriority === b.sortPriority) {
+            return a.updatedAt > b.updatedAt ? 1 : -1;
+          }
+          return a.sortPriority - b.sortPriority;
+        };
+
+        const childrenByFolderId = new Map<string, Array<typeof allFolders[number] | typeof allRequests[number]>>();
+        for (const folder of allFolders) {
+          if (folder.folderId == null) continue;
+          const children = childrenByFolderId.get(folder.folderId) ?? [];
+          children.push(folder);
+          childrenByFolderId.set(folder.folderId, children);
+        }
+        for (const request of allRequests) {
+          if (request.folderId == null) continue;
+          const children = childrenByFolderId.get(request.folderId) ?? [];
+          children.push(request);
+          childrenByFolderId.set(request.folderId, children);
+        }
+
+        const requestsToSend: typeof allRequests = [];
+        const collectRequests = (folderId: string) => {
+          const children = (childrenByFolderId.get(folderId) ?? []).slice().sort(compareByOrder);
+          for (const child of children) {
+            if (child.model === 'folder') {
+              collectRequests(child.id);
+            } else if (child.model === 'http_request') {
+              requestsToSend.push(child);
             }
           }
         };
-        addDescendants(targetFolder.id);
-
-        // Filter HTTP requests to those in the target folder or its descendants
-        const requestsToSend = allRequests.filter(
-          (req) => req.folderId != null && folderIds.has(req.folderId),
-        );
+        collectRequests(targetFolder.id);
 
         if (requestsToSend.length === 0) {
           await ctx.toast.show({
@@ -40,7 +62,7 @@ export const plugin: PluginDefinition = {
           return;
         }
 
-        // Send each request sequentially
+        // Send requests sequentially in the calculated folder order.
         let successCount = 0;
         let errorCount = 0;
 

plugins/template-function-response/src/index.ts

@@ -72,6 +72,10 @@ export const plugin: PluginDefinition = {
           name: 'header',
           label: 'Header Name',
           async dynamic(ctx, args) {
+            // Dynamic form config also runs during send-time rendering.
+            // Keep this preview-only to avoid side-effect request sends.
+            if (args.purpose !== 'preview') return null;
+
             const response = await getResponse(ctx, {
               requestId: String(args.values.request || ''),
               purpose: args.purpose,
@@ -146,6 +150,10 @@ export const plugin: PluginDefinition = {
           label: 'JSONPath or XPath',
           placeholder: '$.books[0].id or /books[0]/id',
           dynamic: async (ctx, args) => {
+            // Dynamic form config also runs during send-time rendering.
+            // Keep this preview-only to avoid side-effect request sends.
+            if (args.purpose !== 'preview') return null;
+
             const resp = await getResponse(ctx, {
               requestId: String(args.values.request || ''),
               purpose: 'preview',