@ctrl/deluge 5.0.1 → 6.1.0

package/dist/src/deluge.d.ts

@@ -1,5 +1,4 @@
-/// <reference types="node" resolution-mode="require"/>
-import { FetchResponse } from 'ofetch';
+import { ofetch } from 'ofetch';
 import type { AddTorrentOptions as NormalizedAddTorrentOptions, AllClientData, NormalizedTorrent, TorrentClient, TorrentSettings } from '@ctrl/shared-torrent';
 import type { AddTorrentOptions, AddTorrentResponse, BooleanStatus, ConfigResponse, DefaultResponse, DelugeSettings, GetHostsResponse, GetHostStatusResponse, ListMethods, PluginInfo, PluginsListResponse, StringStatus, TorrentFiles, TorrentInfo, TorrentListResponse, TorrentOptions, TorrentStatus, Tracker, UploadResponse } from './types.js';
 export declare class Deluge implements TorrentClient {
@@ -56,7 +55,7 @@ export declare class Deluge implements TorrentClient {
      * @returns a list of method names
      */
     listMethods(auth?: boolean): Promise<ListMethods>;
-    upload(torrent: string | Buffer): Promise<UploadResponse>;
+    upload(torrent: string | Uint8Array): Promise<UploadResponse>;
     /**
      * Download a torrent from url, pass the result to {@link Deluge.addTorrent}
      * @param url
@@ -64,8 +63,8 @@ export declare class Deluge implements TorrentClient {
      * @returns file path
      */
     downloadFromUrl(url: string, cookies?: string): Promise<string>;
-    addTorrent(torrent: string | Buffer, config?: Partial<AddTorrentOptions>): Promise<AddTorrentResponse>;
-    normalizedAddTorrent(torrent: string | Buffer, options?: Partial<NormalizedAddTorrentOptions>): Promise<NormalizedTorrent>;
+    addTorrent(torrent: string | Uint8Array, config?: Partial<AddTorrentOptions>): Promise<AddTorrentResponse>;
+    normalizedAddTorrent(torrent: string | Uint8Array, options?: Partial<NormalizedAddTorrentOptions>): Promise<NormalizedTorrent>;
     addTorrentMagnet(magnet: string, config?: Partial<AddTorrentOptions>): Promise<BooleanStatus>;
     /**
      *
@@ -106,6 +105,6 @@ export declare class Deluge implements TorrentClient {
     getPluginInfo(plugins: string[]): Promise<PluginInfo>;
     enablePlugin(plugins: string[]): Promise<DefaultResponse>;
     disablePlugin(plugins: string[]): Promise<DefaultResponse>;
-    request<T extends object>(method: string, params?: any[], needsAuth?: boolean, autoConnect?: boolean): Promise<FetchResponse<T>>;
+    request<T extends object>(method: string, params?: any[], needsAuth?: boolean, autoConnect?: boolean): Promise<ReturnType<typeof ofetch.raw<T>>>;
     private _validateAuth;
 }

package/dist/src/deluge.js

@@ -2,6 +2,7 @@ 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 { magnetDecode } from '@ctrl/magnet-link';
 import { normalizeTorrentData } from './normalizeTorrentData.js';
 const defaults = {
@@ -153,7 +154,7 @@ export class Deluge {
         const form = new FormData();
         const type = { type: 'application/x-bittorrent' };
         if (typeof torrent === 'string') {
-            form.set('file', new File([Buffer.from(torrent, 'base64')], 'file.torrent', type));
+            form.set('file', new File([base64ToUint8Array(torrent)], 'file.torrent', type));
         }
         else {
             const file = new File([torrent], 'torrent', type);
@@ -187,7 +188,7 @@ export class Deluge {
     }
     async addTorrent(torrent, config = {}) {
         let path;
-        if (Buffer.isBuffer(torrent) || !torrent.startsWith('/tmp/')) {
+        if (isUint8Array(torrent) || !torrent.startsWith('/tmp/')) {
             const upload = await this.upload(torrent);
             if (!upload.success || !upload.files.length) {
                 throw new Error('Failed to upload');
@@ -238,8 +239,8 @@ export class Deluge {
             await this.addTorrentMagnet(torrent, torrentOptions);
         }
         else {
-            if (!Buffer.isBuffer(torrent)) {
-                torrent = Buffer.from(torrent);
+            if (!isUint8Array(torrent)) {
+                torrent = stringToUint8Array(torrent);
             }
             const res = await this.addTorrent(torrent, torrentOptions);
             torrentHash = res.result[0][1];
@@ -548,9 +549,7 @@ export class Deluge {
     }
     async _validateAuth() {
         let validAuth = await this.checkSession();
-        if (!validAuth) {
-            validAuth = await this.login();
-        }
+        validAuth ||= await this.login();
         if (!validAuth) {
             throw new Error('Invalid Auth');
         }

package/dist/src/types.d.ts

@@ -16,7 +16,7 @@ export interface ListMethods extends DefaultResponse {
     result: string[];
 }
 export interface AddTorrentResponse extends DefaultResponse {
-    result: Array<[boolean, string]>;
+    result: [boolean, string][];
 }
 /**
  * ex -
@@ -35,7 +35,7 @@ export interface GetHostsResponse extends DefaultResponse {
      * port - 58846
      * status - "Online"
      */
-    result: Array<[string, string, number, string]>;
+    result: [string, string, number, string][];
 }
 export type HostStatus = 'Online' | 'Offline' | 'Connected';
 export interface GetHostStatusResponse extends DefaultResponse {
@@ -101,9 +101,9 @@ export interface TorrentList {
  * ['label', 'id']
  */
 export interface TorrentFilters {
-    state: Array<[string, number]>;
-    tracker_host: Array<[string, number]>;
-    label?: Array<[string, number]>;
+    state: [string, number][];
+    tracker_host: [string, number][];
+    label?: [string, number][];
 }
 export interface Stats {
     upload_protocol_rate: number;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ctrl/deluge",
-  "version": "5.0.1",
+  "version": "6.1.0",
   "description": "TypeScript api wrapper for deluge using got",
   "author": "Scott Cooper <scttcper@gmail.com>",
   "license": "MIT",
@@ -18,8 +18,12 @@
   ],
   "sideEffects": false,
   "scripts": {
-    "lint": "eslint --ext .js,.ts, .",
-    "lint:fix": "eslint --fix --ext .js,.ts, .",
+    "lint": "pnpm run '/^(lint:biome|lint:eslint)$/'",
+    "lint:biome": "biome check .",
+    "lint:eslint": "eslint .",
+    "lint:fix": "pnpm run '/^(lint:biome|lint:eslint):fix$/'",
+    "lint:eslint:fix": "eslint . --fix",
+    "lint:biome:fix": "biome check . --apply",
     "prepare": "npm run build",
     "build": "tsc",
     "build:docs": "typedoc",
@@ -28,23 +32,25 @@
     "test:ci": "vitest run --coverage --reporter=default --reporter=junit --outputFile=./junit.xml"
   },
   "dependencies": {
-    "@ctrl/magnet-link": "^3.1.2",
-    "@ctrl/shared-torrent": "^5.0.0",
-    "node-fetch-native": "^1.4.1",
-    "ofetch": "^1.3.3",
-    "tough-cookie": "^4.1.3",
-    "ufo": "^1.3.1"
+    "@ctrl/magnet-link": "^4.0.2",
+    "@ctrl/shared-torrent": "^6.0.0",
+    "node-fetch-native": "^1.6.4",
+    "ofetch": "^1.3.4",
+    "tough-cookie": "^4.1.4",
+    "ufo": "^1.5.3",
+    "uint8array-extras": "^1.2.0"
   },
   "devDependencies": {
-    "@ctrl/eslint-config": "4.0.9",
-    "@sindresorhus/tsconfig": "5.0.0",
-    "@types/node": "20.8.10",
-    "@types/tough-cookie": "4.0.4",
-    "@vitest/coverage-v8": "0.34.6",
+    "@biomejs/biome": "1.8.3",
+    "@ctrl/eslint-config-biome": "3.1.3",
+    "@sindresorhus/tsconfig": "6.0.0",
+    "@types/node": "20.14.9",
+    "@types/tough-cookie": "4.0.5",
+    "@vitest/coverage-v8": "1.6.0",
     "p-wait-for": "5.0.2",
-    "typedoc": "0.25.3",
-    "typescript": "5.2.2",
-    "vitest": "0.34.6"
+    "typedoc": "0.26.3",
+    "typescript": "5.5.3",
+    "vitest": "1.6.0"
   },
   "publishConfig": {
     "access": "public",