@ctrl/deluge 7.5.3 → 8.0.0

package/dist/src/deluge.d.ts

@@ -1,11 +1,11 @@
 import type { AddTorrentOptions as NormalizedAddTorrentOptions, AllClientData, NormalizedTorrent, TorrentClient, TorrentClientConfig, TorrentClientState } from '@ctrl/shared-torrent';
 import { ofetch } from 'ofetch';
-import { Cookie } from 'tough-cookie';
 import type { Jsonify } from 'type-fest';
 import type { AddTorrentOptions, AddTorrentResponse, BooleanStatus, ConfigResponse, DefaultResponse, DelugeSettings, GetHostsResponse, GetHostStatusResponse, ListMethods, PluginInfo, PluginsListResponse, StringStatus, TorrentFiles, TorrentInfo, TorrentListResponse, TorrentOptions, TorrentStatus, Tracker, UploadResponse } from './types.js';
 interface DelugeState extends TorrentClientState {
     auth: {
-        cookie?: Cookie;
+        cookieHeader?: string;
+        expires?: string;
         msgId: number;
     };
 }
@@ -116,5 +116,6 @@ export declare class Deluge implements TorrentClient {
     disablePlugin(plugins: string[]): Promise<DefaultResponse>;
     request<T extends object>(method: string, params?: any[], needsAuth?: boolean, autoConnect?: boolean): Promise<ReturnType<typeof ofetch.raw<T>>>;
     private _validateAuth;
+    private _setAuthCookie;
 }
 export {};

package/dist/src/deluge.js

@@ -1,7 +1,7 @@
 import { magnetDecode } from '@ctrl/magnet-link';
+import { parseSetCookie, splitSetCookieString, stringifyCookie } from 'cookie-es';
 import { FormData } from 'node-fetch-native';
 import { ofetch } from 'ofetch';
-import { Cookie } from 'tough-cookie';
 import { joinURL } from 'ufo';
 import { base64ToUint8Array, isUint8Array, stringToUint8Array } from 'uint8array-extras';
 import { normalizeTorrentData } from './normalizeTorrentData.js';
@@ -18,7 +18,8 @@ export class Deluge {
             ...state,
             auth: state.auth
                 ? {
-                    cookie: Cookie.fromJSON(state.auth.cookie),
+                    cookieHeader: state.auth.cookieHeader,
+                    expires: state.auth.expires ? new Date(state.auth.expires).toISOString() : undefined,
                     msgId: state.auth.msgId,
                 }
                 : { msgId: 0 },
@@ -33,12 +34,7 @@ export class Deluge {
     exportState() {
         return JSON.parse(JSON.stringify({
             ...this.state,
-            auth: this.state.auth
-                ? {
-                    cookie: this.state.auth.cookie.toJSON(),
-                    msgId: this.state.auth.msgId,
-                }
-                : { msgId: 0 },
+            auth: this.state.auth,
         }));
     }
     resetSession() {
@@ -97,25 +93,25 @@ export class Deluge {
      */
     async checkSession() {
         // cookie is missing or expires in x seconds
-        if (this.state.auth.cookie) {
-            if (this.state.auth.cookie.TTL() < 5000) {
-                this.resetSession();
-                return false;
-            }
-            return true;
+        if (!this.state.auth.cookieHeader) {
+            this.resetSession();
+            return false;
         }
-        if (this.state.auth.cookie) {
-            try {
-                const check = await this.request('auth.check_session', undefined, false);
-                const body = await check.json();
-                if (body?.result) {
-                    return true;
-                }
-            }
-            catch {
-                // do nothing
+        const expires = this.state.auth.expires ? new Date(this.state.auth.expires) : undefined;
+        if (expires && expires.getTime() - Date.now() < 5000) {
+            this.resetSession();
+            return false;
+        }
+        try {
+            const check = await this.request('auth.check_session', undefined, false);
+            const body = check._data;
+            if (body?.result) {
+                return true;
             }
         }
+        catch {
+            // do nothing
+        }
         this.resetSession();
         return false;
     }
@@ -129,7 +125,7 @@ export class Deluge {
         if (!res.ok || !res.headers?.get('set-cookie')?.length) {
             throw new Error('Auth failed, incorrect password');
         }
-        this.state.auth.cookie = Cookie.parse(res.headers.get('set-cookie'));
+        this._setAuthCookie(res.headers.get('set-cookie'));
         return true;
     }
     /**
@@ -319,7 +315,7 @@ export class Deluge {
         }
         // update current password to new password
         this.config.password = password;
-        this.state.auth.cookie = Cookie.parse(res.headers.get('set-cookie'));
+        this._setAuthCookie(res.headers.get('set-cookie'));
         return body;
     }
     async getAllData() {
@@ -546,7 +542,7 @@ export class Deluge {
             }
         }
         const headers = {
-            Cookie: this.state.auth.cookie?.cookieString?.(),
+            Cookie: this.state.auth.cookieHeader,
         };
         const url = joinURL(this.config.baseUrl, this.config.path);
         const res = await ofetch.raw(url, {
@@ -576,4 +572,18 @@ export class Deluge {
             throw new Error('Invalid Auth');
         }
     }
+    _setAuthCookie(setCookie) {
+        const authSetCookie = setCookie ? splitSetCookieString(setCookie)[0] : undefined;
+        const parsed = authSetCookie ? parseSetCookie(authSetCookie) : undefined;
+        const expiresValue = authSetCookie
+            ? /(?:^|;)\s*expires=([^;]+)/i.exec(authSetCookie)?.[1]
+            : undefined;
+        const expires = expiresValue ? new Date(expiresValue) : undefined;
+        this.state.auth.cookieHeader =
+            parsed?.name && parsed.value !== undefined
+                ? stringifyCookie({ [parsed.name]: parsed.value })
+                : undefined;
+        this.state.auth.expires =
+            expires && !Number.isNaN(expires.getTime()) ? expires.toISOString() : undefined;
+    }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ctrl/deluge",
-  "version": "7.5.3",
+  "version": "8.0.0",
   "description": "TypeScript api wrapper for deluge using ofetch",
   "keywords": [
     "deluge",
@@ -33,9 +33,9 @@
   "dependencies": {
     "@ctrl/magnet-link": "^4.3.0",
     "@ctrl/shared-torrent": "^6.5.1",
+    "cookie-es": "^3.0.1",
     "node-fetch-native": "^1.6.7",
     "ofetch": "^1.5.1",
-    "tough-cookie": "^6.0.1",
     "type-fest": "^5.5.0",
     "ufo": "^1.6.3",
     "uint8array-extras": "^1.5.0"