@ctrl/transmission 3.0.0 → 4.1.1

package/dist/src/index.d.ts

@@ -0,0 +1,2 @@
+export * from './transmission.js';
+export * from './types.js';

package/dist/src/index.js

@@ -0,0 +1,2 @@
+export * from './transmission.js';
+export * from './types.js';

package/dist/{transmission.d.ts → src/transmission.d.ts}

@@ -1,7 +1,7 @@
-/// <reference types="node" />
+/// <reference types="node" resolution-mode="require"/>
 import { Response } from 'got';
 import { AddTorrentOptions as NormalizedAddTorrentOptions, AllClientData, NormalizedTorrent, TorrentClient, TorrentSettings } from '@ctrl/shared-torrent';
-import { AddTorrentOptions, AddTorrentResponse, DefaultResponse, FreeSpaceResponse, GetTorrentRepsonse, NormalizedTorrentIds, RenamePathOptions, SessionArguments, SessionResponse, SetTorrentOptions } from './types';
+import { AddTorrentOptions, AddTorrentResponse, DefaultResponse, FreeSpaceResponse, GetTorrentRepsonse, NormalizedTorrentIds, RenamePathOptions, SessionArguments, SessionResponse, SetTorrentOptions } from './types.js';
 export declare class Transmission implements TorrentClient {
     config: TorrentSettings;
     sessionId?: string;

package/dist/{transmission.js → src/transmission.js}

@@ -1,13 +1,8 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Transmission = void 0;
-const fs_1 = require("fs");
-const got_1 = __importDefault(require("got"));
-const shared_torrent_1 = require("@ctrl/shared-torrent");
-const url_join_1 = require("@ctrl/url-join");
+import { existsSync, readFileSync } from 'fs';
+import got from 'got';
+import { magnetDecode } from '@ctrl/magnet-link';
+import { TorrentState, } from '@ctrl/shared-torrent';
+import { urlJoin } from '@ctrl/url-join';
 const defaults = {
     baseUrl: 'http://localhost:9091/',
     path: '/transmission/rpc',
@@ -15,8 +10,20 @@ const defaults = {
     password: '',
     timeout: 5000,
 };
-class Transmission {
+export class Transmission {
     constructor(options = {}) {
+        Object.defineProperty(this, "config", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "sessionId", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
         this.config = { ...defaults, ...options };
     }
     async getSession() {
@@ -145,8 +152,8 @@ class Transmission {
             ...options,
         };
         if (typeof torrent === 'string') {
-            args.metainfo = (0, fs_1.existsSync)(torrent)
-                ? Buffer.from((0, fs_1.readFileSync)(torrent)).toString('base64')
+            args.metainfo = existsSync(torrent)
+                ? Buffer.from(readFileSync(torrent)).toString('base64')
                 : Buffer.from(torrent, 'base64').toString('base64');
         }
         else {
@@ -160,11 +167,21 @@ class Transmission {
         if (options.startPaused) {
             torrentOptions.paused = true;
         }
-        if (!Buffer.isBuffer(torrent)) {
-            torrent = Buffer.from(torrent);
+        let torrentHash;
+        if (typeof torrent === 'string' && torrent.startsWith('magnet:')) {
+            torrentHash = magnetDecode(torrent).infoHash;
+            if (!torrentHash) {
+                throw new Error('Magnet did not contain hash');
+            }
+            await this.addMagnet(torrent, torrentOptions);
+        }
+        else {
+            if (!Buffer.isBuffer(torrent)) {
+                torrent = Buffer.from(torrent);
+            }
+            const res = await this.addTorrent(torrent, torrentOptions);
+            torrentHash = res.arguments['torrent-added'].hashString;
         }
-        const res = await this.addTorrent(torrent, torrentOptions);
-        const torrentHash = [res.arguments['torrent-added'].hashString];
         if (options.label) {
             await this.setTorrent(torrentHash, { labels: [options.label] });
         }
@@ -269,7 +286,6 @@ class Transmission {
         return res.body;
     }
     async request(method, args = {}) {
-        var _a, _b, _c;
         if (!this.sessionId && method !== 'session-get') {
             await this.getSession();
         }
@@ -277,27 +293,27 @@ class Transmission {
             'X-Transmission-Session-Id': this.sessionId,
         };
         if (this.config.username || this.config.password) {
-            const str = `${(_a = this.config.username) !== null && _a !== void 0 ? _a : ''}:${(_b = this.config.password) !== null && _b !== void 0 ? _b : ''}`;
+            const str = `${this.config.username ?? ''}:${this.config.password ?? ''}`;
             headers.Authorization = 'Basic ' + Buffer.from(str).toString('base64');
         }
-        const url = (0, url_join_1.urlJoin)(this.config.baseUrl, this.config.path);
+        const url = urlJoin(this.config.baseUrl, this.config.path);
         try {
-            const res = await got_1.default.post(url, {
+            const res = await got.post(url, {
                 json: {
                     method,
                     arguments: args,
                 },
                 headers,
-                retry: 0,
+                retry: { limit: 0 },
                 // allow proxy agent
-                agent: this.config.agent,
-                timeout: this.config.timeout,
+                timeout: { request: this.config.timeout },
                 responseType: 'json',
+                ...(this.config.agent ? { agent: this.config.agent } : {}),
             });
             return res;
         }
         catch (error) {
-            if (((_c = error === null || error === void 0 ? void 0 : error.response) === null || _c === void 0 ? void 0 : _c.statusCode) === 409) {
+            if (error?.response?.statusCode === 409) {
                 this.sessionId = error.response.headers['x-transmission-session-id'];
                 // eslint-disable-next-line no-return-await
                 return await this.request(method, args);
@@ -313,26 +329,25 @@ class Transmission {
         return ids;
     }
     _normalizeTorrentData(torrent) {
-        var _a;
         const dateAdded = new Date(torrent.addedDate * 1000).toISOString();
         const dateCompleted = new Date(torrent.doneDate * 1000).toISOString();
         // normalize state to enum
         // https://github.com/transmission/transmission/blob/c11f2870fd18ff781ca06ce84b6d43541f3293dd/web/javascript/torrent.js#L18
-        let state = shared_torrent_1.TorrentState.unknown;
+        let state = TorrentState.unknown;
         if (torrent.status === 6) {
-            state = shared_torrent_1.TorrentState.seeding;
+            state = TorrentState.seeding;
         }
         else if (torrent.status === 4) {
-            state = shared_torrent_1.TorrentState.downloading;
+            state = TorrentState.downloading;
         }
         else if (torrent.status === 0) {
-            state = shared_torrent_1.TorrentState.paused;
+            state = TorrentState.paused;
         }
         else if (torrent.status === 2) {
-            state = shared_torrent_1.TorrentState.checking;
+            state = TorrentState.checking;
         }
         else if (torrent.status === 3 || torrent.status === 5) {
-            state = shared_torrent_1.TorrentState.queued;
+            state = TorrentState.queued;
         }
         return {
             id: torrent.hashString,
@@ -344,7 +359,7 @@ class Transmission {
             ratio: torrent.uploadRatio,
             dateAdded,
             dateCompleted,
-            label: ((_a = torrent.labels) === null || _a === void 0 ? void 0 : _a.length) ? torrent.labels[0] : undefined,
+            label: torrent.labels?.length ? torrent.labels[0] : undefined,
             savePath: torrent.downloadDir,
             uploadSpeed: torrent.rateUpload,
             downloadSpeed: torrent.rateDownload,
@@ -361,4 +376,3 @@ class Transmission {
         };
     }
 }
-exports.Transmission = Transmission;

package/dist/src/types.js

@@ -0,0 +1 @@
+export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ctrl/transmission",
-  "version": "3.0.0",
+  "version": "4.1.1",
   "description": "TypeScript api wrapper for transmission using got",
   "author": "Scott Cooper <scttcper@gmail.com>",
   "license": "MIT",
@@ -9,58 +9,52 @@
     "transmission",
     "typescript"
   ],
-  "main": "dist/index.js",
-  "typings": "dist/index.d.ts",
+  "type": "module",
+  "main": "./dist/src/index.js",
+  "typings": "./dist/src/index.d.ts",
   "files": [
-    "dist"
+    "dist/src"
   ],
   "sideEffects": false,
   "scripts": {
     "lint": "eslint --ext .ts .",
     "lint:fix": "eslint --fix --ext .ts .",
     "prepare": "npm run build",
-    "build": "tsc -p tsconfig.build.json",
+    "build": "tsc",
     "build:docs": "typedoc",
-    "test": "jest --runInBand",
-    "test:watch": "jest --watch --runInBand",
-    "test:ci": "jest --ci --runInBand --reporters=default --reporters=jest-junit --coverage"
+    "test": "vitest run",
+    "test:watch": "vitest",
+    "test:ci": "vitest run --coverage"
   },
   "dependencies": {
-    "@ctrl/shared-torrent": "^3.0.5",
-    "got": "^11.8.3",
-    "@ctrl/url-join": "^1.0.4"
+    "@ctrl/magnet-link": "^3.1.0",
+    "@ctrl/shared-torrent": "^4.1.1",
+    "@ctrl/url-join": "^2.0.0",
+    "got": "^12.1.0"
   },
   "devDependencies": {
-    "@babel/plugin-transform-modules-commonjs": "7.16.8",
-    "@babel/preset-typescript": "7.16.7",
-    "@ctrl/eslint-config": "3.3.1",
-    "@jest/globals": "27.4.6",
-    "@types/node": "17.0.14",
-    "jest": "27.4.7",
-    "jest-junit": "13.0.0",
-    "p-wait-for": "3.2.0",
-    "typedoc": "0.22.11",
-    "typescript": "4.5.5"
+    "@ctrl/eslint-config": "3.4.4",
+    "@sindresorhus/tsconfig": "3.0.1",
+    "@types/node": "17.0.38",
+    "c8": "7.11.3",
+    "p-wait-for": "4.1.0",
+    "typedoc": "0.22.17",
+    "typescript": "4.7.2",
+    "vitest": "0.13.1"
   },
   "jest": {
     "testEnvironment": "node",
     "coverageProvider": "v8"
   },
-  "babel": {
-    "presets": [
-      "@babel/preset-typescript"
-    ],
-    "plugins": [
-      "@babel/plugin-transform-modules-commonjs"
-    ]
-  },
   "publishConfig": {
     "access": "public"
   },
   "release": {
-    "branch": "master"
+    "branches": [
+      "master"
+    ]
   },
   "engines": {
-    "node": ">=10.19.0"
+    "node": ">=14.16"
   }
 }

package/dist/index.d.ts

@@ -1,2 +0,0 @@
-export * from './transmission';
-export * from './types';

package/dist/index.js

@@ -1,14 +0,0 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./transmission"), exports);
-__exportStar(require("./types"), exports);

package/dist/types.js

@@ -1,2 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });