global: snapshot

crates/brk_bindgen/src/generators/javascript/api.rs

@@ -69,16 +69,32 @@ pub fn generate_api_methods(output: &mut String, endpoints: &[Endpoint]) {
             .unwrap();
         }
 
+        writeln!(
+            output,
+            "   * @param {{{{ signal?: AbortSignal, onUpdate?: (value: {}) => void }}}} [options]",
+            return_type
+        )
+        .unwrap();
         writeln!(output, "   * @returns {{Promise<{}>}}", return_type).unwrap();
         writeln!(output, "   */").unwrap();
 
         let params = build_method_params(endpoint);
-        writeln!(output, "  async {}({}) {{", method_name, params).unwrap();
+        let params_with_opts = if params.is_empty() {
+            "{ signal, onUpdate } = {}".to_string()
+        } else {
+            format!("{}, {{ signal, onUpdate }} = {{}}", params)
+        };
+        writeln!(output, "  async {}({}) {{", method_name, params_with_opts).unwrap();
 
         let path = build_path_template(&endpoint.path, &endpoint.path_params);
 
         if endpoint.query_params.is_empty() {
-            writeln!(output, "    return this.getJson(`{}`);", path).unwrap();
+            writeln!(
+                output,
+                "    return this.getJson(`{}`, {{ signal, onUpdate }});",
+                path
+            )
+            .unwrap();
         } else {
             writeln!(output, "    const params = new URLSearchParams();").unwrap();
             for param in &endpoint.query_params {
@@ -109,11 +125,11 @@ pub fn generate_api_methods(output: &mut String, endpoints: &[Endpoint]) {
 
             if endpoint.supports_csv {
                 writeln!(output, "    if (format === 'csv') {{").unwrap();
-                writeln!(output, "      return this.getText(path);").unwrap();
+                writeln!(output, "      return this.getText(path, {{ signal }});").unwrap();
                 writeln!(output, "    }}").unwrap();
-                writeln!(output, "    return this.getJson(path);").unwrap();
+                writeln!(output, "    return this.getJson(path, {{ signal, onUpdate }});").unwrap();
             } else {
-                writeln!(output, "    return this.getJson(path);").unwrap();
+                writeln!(output, "    return this.getJson(path, {{ signal, onUpdate }});").unwrap();
             }
         }
 

crates/brk_bindgen/src/generators/javascript/client.rs

@@ -404,11 +404,14 @@ class BrkClientBase {{
 
   /**
    * @param {{string}} path
+   * @param {{{{ signal?: AbortSignal }}}} [options]
    * @returns {{Promise<Response>}}
    */
-  async get(path) {{
+  async get(path, {{ signal }} = {{}}) {{
     const url = `${{this.baseUrl}}${{path}}`;
-    const res = await fetch(url, {{ signal: AbortSignal.timeout(this.timeout) }});
+    const signals = [AbortSignal.timeout(this.timeout)];
+    if (signal) signals.push(signal);
+    const res = await fetch(url, {{ signal: AbortSignal.any(signals) }});
     if (!res.ok) throw new BrkError(`HTTP ${{res.status}}: ${{url}}`, res.status);
     return res;
   }}
@@ -417,10 +420,10 @@ class BrkClientBase {{
    * Make a GET request - races cache vs network, first to resolve calls onUpdate
    * @template T
    * @param {{string}} path
-   * @param {{(value: T) => void}} [onUpdate] - Called when data is available (may be called twice: cache then network)
+   * @param {{{{ onUpdate?: (value: T) => void, signal?: AbortSignal }}}} [options]
    * @returns {{Promise<T>}}
    */
-  async getJson(path, onUpdate) {{
+  async getJson(path, {{ onUpdate, signal }} = {{}}) {{
     const url = `${{this.baseUrl}}${{path}}`;
     const cache = this._cache ?? await this._cachePromise;
 
@@ -440,7 +443,7 @@ class BrkClientBase {{
       return json;
     }});
 
-    const networkPromise = this.get(path).then(async (res) => {{
+    const networkPromise = this.get(path, {{ signal }}).then(async (res) => {{
       const cloned = res.clone();
       const json = _addCamelGetters(await res.json());
       // Skip update if ETag matches and cache already delivered
@@ -472,10 +475,11 @@ class BrkClientBase {{
   /**
    * Make a GET request and return raw text (for CSV responses)
    * @param {{string}} path
+   * @param {{{{ signal?: AbortSignal }}}} [options]
    * @returns {{Promise<string>}}
    */
-  async getText(path) {{
-    const res = await this.get(path);
+  async getText(path, {{ signal }} = {{}}) {{
+    const res = await this.get(path, {{ signal }});
     return res.text();
   }}
 
@@ -488,7 +492,7 @@ class BrkClientBase {{
    */
   async _fetchSeriesData(path, onUpdate) {{
     const wrappedOnUpdate = onUpdate ? (/** @type {{SeriesData<T>}} */ raw) => onUpdate(_wrapSeriesData(raw)) : undefined;
-    const raw = await this.getJson(path, wrappedOnUpdate);
+    const raw = await this.getJson(path, {{ onUpdate: wrappedOnUpdate }});
     return _wrapSeriesData(raw);
   }}
 }}