tsarr 2.10.0 → 2.11.1

package/dist/clients/qbittorrent.js

@@ -745,126 +745,115 @@ var createClient = (config = {}) => {
     return { opts: resolvedOpts, url };
   };
   const request = async (options) => {
-    const { opts, url } = await beforeRequest(options);
-    const requestInit = {
-      redirect: "follow",
-      ...opts,
-      body: getValidRequestBody(opts)
-    };
-    let request2 = new Request(url, requestInit);
-    for (const fn of interceptors.request.fns) {
-      if (fn) {
-        request2 = await fn(request2, opts);
-      }
-    }
-    const _fetch = opts.fetch;
+    const throwOnError = options.throwOnError ?? _config.throwOnError;
+    const responseStyle = options.responseStyle ?? _config.responseStyle;
+    let request2;
     let response;
     try {
-      response = await _fetch(request2);
-    } catch (error2) {
-      let finalError2 = error2;
-      for (const fn of interceptors.error.fns) {
+      const { opts, url } = await beforeRequest(options);
+      const requestInit = {
+        redirect: "follow",
+        ...opts,
+        body: getValidRequestBody(opts)
+      };
+      request2 = new Request(url, requestInit);
+      for (const fn of interceptors.request.fns) {
         if (fn) {
-          finalError2 = await fn(error2, undefined, request2, opts);
+          request2 = await fn(request2, opts);
         }
       }
-      finalError2 = finalError2 || {};
-      if (opts.throwOnError) {
-        throw finalError2;
+      const _fetch = opts.fetch;
+      response = await _fetch(request2);
+      for (const fn of interceptors.response.fns) {
+        if (fn) {
+          response = await fn(response, request2, opts);
+        }
       }
-      return opts.responseStyle === "data" ? undefined : {
-        error: finalError2,
+      const result = {
         request: request2,
-        response: undefined
+        response
       };
-    }
-    for (const fn of interceptors.response.fns) {
-      if (fn) {
-        response = await fn(response, request2, opts);
-      }
-    }
-    const result = {
-      request: request2,
-      response
-    };
-    if (response.ok) {
-      const parseAs = (opts.parseAs === "auto" ? getParseAs(response.headers.get("Content-Type")) : opts.parseAs) ?? "json";
-      if (response.status === 204 || response.headers.get("Content-Length") === "0") {
-        let emptyData;
+      if (response.ok) {
+        const parseAs = (opts.parseAs === "auto" ? getParseAs(response.headers.get("Content-Type")) : opts.parseAs) ?? "json";
+        if (response.status === 204 || response.headers.get("Content-Length") === "0") {
+          let emptyData;
+          switch (parseAs) {
+            case "arrayBuffer":
+            case "blob":
+            case "text":
+              emptyData = await response[parseAs]();
+              break;
+            case "formData":
+              emptyData = new FormData;
+              break;
+            case "stream":
+              emptyData = response.body;
+              break;
+            case "json":
+            default:
+              emptyData = {};
+              break;
+          }
+          return opts.responseStyle === "data" ? emptyData : {
+            data: emptyData,
+            ...result
+          };
+        }
+        let data;
         switch (parseAs) {
           case "arrayBuffer":
           case "blob":
+          case "formData":
           case "text":
-            emptyData = await response[parseAs]();
+            data = await response[parseAs]();
             break;
-          case "formData":
-            emptyData = new FormData;
+          case "json": {
+            const text = await response.text();
+            data = text ? JSON.parse(text) : {};
             break;
+          }
           case "stream":
-            emptyData = response.body;
-            break;
-          case "json":
-          default:
-            emptyData = {};
-            break;
+            return opts.responseStyle === "data" ? response.body : {
+              data: response.body,
+              ...result
+            };
         }
-        return opts.responseStyle === "data" ? emptyData : {
-          data: emptyData,
+        if (parseAs === "json") {
+          if (opts.responseValidator) {
+            await opts.responseValidator(data);
+          }
+          if (opts.responseTransformer) {
+            data = await opts.responseTransformer(data);
+          }
+        }
+        return opts.responseStyle === "data" ? data : {
+          data,
           ...result
         };
       }
-      let data;
-      switch (parseAs) {
-        case "arrayBuffer":
-        case "blob":
-        case "formData":
-        case "text":
-          data = await response[parseAs]();
-          break;
-        case "json": {
-          const text = await response.text();
-          data = text ? JSON.parse(text) : {};
-          break;
+      const textError = await response.text();
+      let jsonError;
+      try {
+        jsonError = JSON.parse(textError);
+      } catch {}
+      throw jsonError ?? textError;
+    } catch (error) {
+      let finalError = error;
+      for (const fn of interceptors.error.fns) {
+        if (fn) {
+          finalError = await fn(finalError, response, request2, options);
         }
-        case "stream":
-          return opts.responseStyle === "data" ? response.body : {
-            data: response.body,
-            ...result
-          };
       }
-      if (parseAs === "json") {
-        if (opts.responseValidator) {
-          await opts.responseValidator(data);
-        }
-        if (opts.responseTransformer) {
-          data = await opts.responseTransformer(data);
-        }
+      finalError = finalError || {};
+      if (throwOnError) {
+        throw finalError;
       }
-      return opts.responseStyle === "data" ? data : {
-        data,
-        ...result
+      return responseStyle === "data" ? undefined : {
+        error: finalError,
+        request: request2,
+        response
       };
     }
-    const textError = await response.text();
-    let jsonError;
-    try {
-      jsonError = JSON.parse(textError);
-    } catch {}
-    const error = jsonError ?? textError;
-    let finalError = error;
-    for (const fn of interceptors.error.fns) {
-      if (fn) {
-        finalError = await fn(error, response, request2, opts);
-      }
-    }
-    finalError = finalError || {};
-    if (opts.throwOnError) {
-      throw finalError;
-    }
-    return opts.responseStyle === "data" ? undefined : {
-      error: finalError,
-      ...result
-    };
   };
   const makeMethodFn = (method) => (options) => request({ ...options, method });
   const makeSseFn = (method) => async (options) => {
@@ -872,7 +861,6 @@ var createClient = (config = {}) => {
     return createSseClient({
       ...opts,
       body: opts.body,
-      headers: opts.headers,
       method,
       onRequest: async (url2, init) => {
         let request2 = new Request(url2, init);
@@ -1011,6 +999,7 @@ class QBittorrentClient {
   username;
   password;
   sid = null;
+  cookieName = "SID";
   fetch;
   constructor(config) {
     if (!config.baseUrl) {
@@ -1019,16 +1008,40 @@ class QBittorrentClient {
     this.baseUrl = config.baseUrl.replace(/\/$/, "");
     this.username = config.username;
     this.password = config.password;
-    this.fetch = createResilientFetch({
+    const baseFetch = createResilientFetch({
       timeout: config.timeout ?? DEFAULT_TIMEOUT_MS,
       retry: config.retry
     });
+    this.fetch = (input, init) => this.fetchWithCookieName(baseFetch, input, init);
     client.setConfig({
       baseUrl: `${this.baseUrl}/api/v2`,
       auth: () => this.ensureAuth(),
       fetch: this.fetch
     });
   }
+  async fetchWithCookieName(baseFetch, input, init) {
+    if (this.cookieName === "SID") {
+      return baseFetch(input, init);
+    }
+    if (input instanceof Request) {
+      const cookie = input.headers.get("cookie");
+      if (cookie?.includes("SID=")) {
+        const headers = new Headers(input.headers);
+        headers.set("cookie", cookie.replace(/(^|;\s*)SID=/, `$1${this.cookieName}=`));
+        return baseFetch(new Request(input, { headers }), init);
+      }
+      return baseFetch(input, init);
+    }
+    if (init?.headers) {
+      const headers = new Headers(init.headers);
+      const cookie = headers.get("cookie");
+      if (cookie?.includes("SID=")) {
+        headers.set("cookie", cookie.replace(/(^|;\s*)SID=/, `$1${this.cookieName}=`));
+        return baseFetch(input, { ...init, headers });
+      }
+    }
+    return baseFetch(input, init);
+  }
   async ensureAuth() {
     if (!this.sid) {
       await this.login();
@@ -1050,16 +1063,17 @@ class QBittorrentClient {
     if (!response.ok) {
       throw new ConnectionError(`qBittorrent login failed (${response.status})`);
     }
-    const text = await response.text();
-    if (text.trim() !== "Ok.") {
+    const text = (await response.text()).trim();
+    if (text && text !== "Ok.") {
       throw new ConnectionError("qBittorrent authentication failed: invalid username or password");
     }
     const setCookie = response.headers.get("set-cookie");
-    const sidMatch = setCookie?.match(/SID=([^;]+)/);
+    const sidMatch = setCookie?.match(/(SID|QBT_SID_\d+)=([^;]+)/);
     if (!sidMatch) {
       throw new ConnectionError("qBittorrent login succeeded but no SID cookie received");
     }
-    this.sid = sidMatch[1];
+    this.cookieName = sidMatch[1];
+    this.sid = sidMatch[2];
   }
   async getAppVersion() {
     const result = await appVersionGet();
@@ -1104,3 +1118,6 @@ class QBittorrentClient {
 export {
   QBittorrentClient
 };
+
+//# debugId=EEFE0D3C2E02FFD464756E2164756E21
+//# sourceMappingURL=qbittorrent.js.map