redfireforge-cli 0.8.10 → 0.8.11

package/dist/redfireforge.mjs

@@ -30809,42 +30809,121 @@ async function httpFetch(url, method, headers, body, signal) {
   }
   return proxyFetch(url, method, headers, body, signal);
 }
-async function tauriFetch(url, method, headers, body, signal) {
+var _studioInvoke;
+var _pluginHttpFetch = null;
+function isStudioHttpFetchResponse(value) {
+  return typeof value === "object" && value !== null && typeof value.status === "number" && typeof value.body === "string";
+}
+async function getStudioInvoke() {
+  if (_studioInvoke !== void 0) return _studioInvoke;
   try {
-    const { fetch: tFetch } = await Promise.resolve().then(() => (init_dist_js(), dist_js_exports));
-    const opts = {
-      method,
-      headers
-    };
-    if (body && method !== "GET") {
-      opts.body = body;
+    const { invoke: invoke2 } = await Promise.resolve().then(() => (init_core(), core_exports));
+    _studioInvoke = (cmd, args) => invoke2(cmd, args);
+  } catch {
+    _studioInvoke = null;
+  }
+  return _studioInvoke;
+}
+function studioResponseToHttp(native, t0, tDone) {
+  return {
+    status: native.status,
+    statusText: native.statusText ?? "",
+    headers: native.headers ?? {},
+    body: native.body ?? "",
+    error: native.error,
+    timing: {
+      dnsLookup: 0,
+      tcpConnect: 0,
+      tlsHandshake: 0,
+      ttfb: round2(tDone - t0),
+      download: 0,
+      total: round2(tDone - t0)
     }
-    if (signal) {
-      opts.signal = signal;
+  };
+}
+async function tauriFetchViaPooledCommand(url, method, headers, body, signal) {
+  if (signal?.aborted) {
+    return { status: 0, statusText: "", headers: {}, body: "", error: "Aborted" };
+  }
+  const invoke2 = await getStudioInvoke();
+  if (!invoke2) return null;
+  const request = {
+    url,
+    method,
+    headers,
+    body: body && method !== "GET" && method !== "HEAD" ? body : void 0
+  };
+  const t0 = performance.now();
+  const invokePromise = invoke2("studio_http_fetch", { request });
+  const run2 = async () => {
+    try {
+      const native = await invokePromise;
+      if (!isStudioHttpFetchResponse(native)) return null;
+      return studioResponseToHttp(native, t0, performance.now());
+    } catch {
+      return null;
     }
-    const t0 = performance.now();
-    const response = await tFetch(url, opts);
-    const tFirstByte = performance.now();
-    const responseBody = await response.text();
-    const tDone = performance.now();
-    const responseHeaders = {};
-    response.headers.forEach((v, k) => {
-      responseHeaders[k] = v;
-    });
-    return {
-      status: response.status,
-      statusText: response.statusText,
-      headers: responseHeaders,
-      body: responseBody,
-      timing: {
-        dnsLookup: 0,
-        tcpConnect: 0,
-        tlsHandshake: 0,
-        ttfb: round2(tFirstByte - t0),
-        download: round2(tDone - tFirstByte),
-        total: round2(tDone - t0)
-      }
+  };
+  if (!signal) return run2();
+  return new Promise((resolve6) => {
+    const onAbort = () => {
+      resolve6({ status: 0, statusText: "", headers: {}, body: "", error: "Aborted" });
     };
+    signal.addEventListener("abort", onAbort, { once: true });
+    void run2().then((result) => {
+      signal.removeEventListener("abort", onAbort);
+      if (signal.aborted) {
+        resolve6({ status: 0, statusText: "", headers: {}, body: "", error: "Aborted" });
+        return;
+      }
+      resolve6(result);
+    });
+  });
+}
+async function tauriFetchViaPlugin(url, method, headers, body, signal) {
+  if (!_pluginHttpFetch) {
+    const { fetch: tFetch } = await Promise.resolve().then(() => (init_dist_js(), dist_js_exports));
+    _pluginHttpFetch = tFetch;
+  }
+  const opts = {
+    method,
+    headers
+  };
+  if (body && method !== "GET") {
+    opts.body = body;
+  }
+  if (signal) {
+    opts.signal = signal;
+  }
+  const t0 = performance.now();
+  const response = await _pluginHttpFetch(url, opts);
+  const tFirstByte = performance.now();
+  const responseBody = await response.text();
+  const tDone = performance.now();
+  const responseHeaders = {};
+  response.headers.forEach((v, k) => {
+    responseHeaders[k] = v;
+  });
+  return {
+    status: response.status,
+    statusText: response.statusText,
+    headers: responseHeaders,
+    body: responseBody,
+    timing: {
+      dnsLookup: 0,
+      tcpConnect: 0,
+      tlsHandshake: 0,
+      ttfb: round2(tFirstByte - t0),
+      download: round2(tDone - tFirstByte),
+      total: round2(tDone - t0)
+    }
+  };
+}
+async function tauriFetch(url, method, headers, body, signal) {
+  try {
+    const pooled = await tauriFetchViaPooledCommand(url, method, headers, body, signal);
+    if (pooled) return pooled;
+    return await tauriFetchViaPlugin(url, method, headers, body, signal);
   } catch (err) {
     return {
       status: 0,
@@ -31079,7 +31158,7 @@ function parseJwtExpiry(token) {
     return null;
   }
 }
-async function acquireOAuth2Token(auth) {
+async function fetchOAuth2Token(auth) {
   if (!auth.tokenUrl || !auth.clientId || !auth.clientSecret) {
     throw new Error("OAuth2 requires tokenUrl, clientId, and clientSecret");
   }
@@ -31113,14 +31192,16 @@ var TokenManager = class {
     const nowSec = Math.floor(Date.now() / 1e3);
     return nowSec >= entry.expiresSec - TOKEN_EXPIRY_BUFFER_SEC;
   }
-  async getToken(scenario) {
-    if (scenario.auth?.type !== "oauth2") return void 0;
-    const key = this.credKey(scenario.auth);
+  async getTokenForAuth(auth) {
+    if (auth.type !== "oauth2") {
+      throw new Error("getTokenForAuth requires oauth2 auth");
+    }
+    const key = this.credKey(auth);
     const cached = this.cache.get(key);
     if (cached && !this.isExpired(cached)) return cached.token;
     const inflight = this.pending.get(key);
     if (inflight) return inflight;
-    const refreshPromise = this.refresh(key, scenario.auth);
+    const refreshPromise = this.refresh(key, auth);
     this.pending.set(key, refreshPromise);
     try {
       return await refreshPromise;
@@ -31128,8 +31209,12 @@ var TokenManager = class {
       this.pending.delete(key);
     }
   }
+  async getToken(scenario) {
+    if (scenario.auth?.type !== "oauth2") return void 0;
+    return this.getTokenForAuth(scenario.auth);
+  }
   async refresh(key, auth) {
-    const token = await acquireOAuth2Token(auth);
+    const token = await fetchOAuth2Token(auth);
     const exp = parseJwtExpiry(token);
     const expiresSec = exp ?? Math.floor(Date.now() / 1e3) + 1800;
     this.cache.set(key, { token, expiresSec });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "redfireforge-cli",
-  "version": "0.8.10",
+  "version": "0.8.11",
   "description": "RedfireForge CLI — API Performance Testing from the Command Line",
   "keywords": [
     "api",