cross-seed 5.9.2 → 6.0.0-1

package/README.md

@@ -17,9 +17,15 @@ files to a folder you specify. After that, I recommend using
 [AutoTorrent2](https://github.com/JohnDoee/autotorrent2) to do the last-mile
 delivery into your client.
 
+## 🚨🚨🚨 Breaking changes in cross-seed v6 🚨🚨🚨
+
+Head on over to the
+[v6 migration guide](https://www.cross-seed.org/docs/v6-migration)
+to see the steps required for migration.
+ 
 ## Requirements
 
--   [Node 16+](https://nodejs.org/en/download)
+-   [Node >= 20](https://nodejs.org/en/download)
 -   Any number of indexers that support Torznab (use Jackett or Prowlarr to
     help)
 

package/dist/Result.js

@@ -1,4 +1,5 @@
 class OkResult {
+    contents;
     constructor(contents) {
         this.contents = contents;
     }
@@ -24,6 +25,7 @@ class OkResult {
     }
 }
 class ErrResult {
+    contents;
     constructor(contents) {
         this.contents = contents;
     }

package/dist/Result.js.map

@@ -1 +1 @@
-{"version":3,"file":"Result.js","sourceRoot":"","sources":["../src/Result.ts"],"names":[],"mappings":"AASA,MAAM,QAAQ;IAGb,YAAY,QAAW;QACtB,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;IAC1B,CAAC;IAED,IAAI;QACH,OAAO,IAAI,CAAC;IACb,CAAC;IAED,KAAK;QACJ,OAAO,KAAK,CAAC;IACd,CAAC;IAED,KAAK,CAAI,MAAmB;QAC3B,OAAO,IAAI,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC;IAC5C,CAAC;IAED,6DAA6D;IAC7D,MAAM,CAAI,MAAmB;QAC5B,OAAO,IAA+B,CAAC;IACxC,CAAC;IAED,6DAA6D;IAC7D,aAAa,CAAC,UAAkB;QAC/B,OAAO,IAAI,CAAC,QAAQ,CAAC;IACtB,CAAC;IAED,gBAAgB;QACf,MAAM,IAAI,KAAK,CAAC,qCAAqC,CAAC,CAAC;IACxD,CAAC;CACD;AAED,MAAM,SAAS;IAGd,YAAY,QAAW;QACtB,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;IAC1B,CAAC;IAED,IAAI;QACH,OAAO,KAAK,CAAC;IACd,CAAC;IAED,KAAK;QACJ,OAAO,IAAI,CAAC;IACb,CAAC;IAED,6DAA6D;IAC7D,KAAK,CAAI,MAAmB;QAC3B,OAAO,IAA+B,CAAC;IACxC,CAAC;IAED,MAAM,CAAI,MAAmB;QAC5B,OAAO,IAAI,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC;IAC7C,CAAC;IAED,aAAa,CAAC,UAAkB;QAC/B,MAAM,UAAU,IAAI,IAAI,KAAK,CAAC,sCAAsC,CAAC,CAAC;IACvE,CAAC;IAED,gBAAgB;QACf,OAAO,IAAI,CAAC,QAAQ,CAAC;IACtB,CAAC;CACD;AAED,MAAM,UAAU,QAAQ,CAAO,KAAQ;IACtC,OAAO,IAAI,QAAQ,CAAC,KAAK,CAAC,CAAC;AAC5B,CAAC;AAED,MAAM,UAAU,WAAW,CAAO,KAAQ;IACzC,OAAO,IAAI,SAAS,CAAC,KAAK,CAAC,CAAC;AAC7B,CAAC"}
+{"version":3,"file":"Result.js","sourceRoot":"","sources":["../src/Result.ts"],"names":[],"mappings":"AASA,MAAM,QAAQ;IACI,QAAQ,CAAI;IAE7B,YAAY,QAAW;QACtB,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;IAC1B,CAAC;IAED,IAAI;QACH,OAAO,IAAI,CAAC;IACb,CAAC;IAED,KAAK;QACJ,OAAO,KAAK,CAAC;IACd,CAAC;IAED,KAAK,CAAI,MAAmB;QAC3B,OAAO,IAAI,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC;IAC5C,CAAC;IAED,6DAA6D;IAC7D,MAAM,CAAI,MAAmB;QAC5B,OAAO,IAA+B,CAAC;IACxC,CAAC;IAED,6DAA6D;IAC7D,aAAa,CAAC,UAAkB;QAC/B,OAAO,IAAI,CAAC,QAAQ,CAAC;IACtB,CAAC;IAED,gBAAgB;QACf,MAAM,IAAI,KAAK,CAAC,qCAAqC,CAAC,CAAC;IACxD,CAAC;CACD;AAED,MAAM,SAAS;IACG,QAAQ,CAAI;IAE7B,YAAY,QAAW;QACtB,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;IAC1B,CAAC;IAED,IAAI;QACH,OAAO,KAAK,CAAC;IACd,CAAC;IAED,KAAK;QACJ,OAAO,IAAI,CAAC;IACb,CAAC;IAED,6DAA6D;IAC7D,KAAK,CAAI,MAAmB;QAC3B,OAAO,IAA+B,CAAC;IACxC,CAAC;IAED,MAAM,CAAI,MAAmB;QAC5B,OAAO,IAAI,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC;IAC7C,CAAC;IAED,aAAa,CAAC,UAAkB;QAC/B,MAAM,UAAU,IAAI,IAAI,KAAK,CAAC,sCAAsC,CAAC,CAAC;IACvE,CAAC;IAED,gBAAgB;QACf,OAAO,IAAI,CAAC,QAAQ,CAAC;IACtB,CAAC;CACD;AAED,MAAM,UAAU,QAAQ,CAAO,KAAQ;IACtC,OAAO,IAAI,QAAQ,CAAC,KAAK,CAAC,CAAC;AAC5B,CAAC;AAED,MAAM,UAAU,WAAW,CAAO,KAAQ;IACzC,OAAO,IAAI,SAAS,CAAC,KAAK,CAAC,CAAC;AAC7B,CAAC"}

package/dist/action.js

@@ -1,67 +1,147 @@
 import chalk from "chalk";
-import { existsSync, linkSync, mkdirSync, readdirSync, statSync, symlinkSync, } from "fs";
-import { join, resolve, dirname, basename } from "path";
+import { existsSync, linkSync, mkdirSync, statSync, symlinkSync } from "fs";
+import { dirname, join, resolve } from "path";
 import { getClient } from "./clients/TorrentClient.js";
 import { Action, Decision, InjectionResult, LinkType, SaveResult, } from "./constants.js";
 import { logger } from "./logger.js";
+import { resultOf, resultOfErr } from "./Result.js";
 import { getRuntimeConfig } from "./runtimeConfig.js";
+import { hasVideo } from "./searchee.js";
 import { saveTorrentFile } from "./torrent.js";
 import { getTag } from "./utils.js";
-import { CrossSeedError } from "./errors.js";
-export async function validateAction() {
-    const { action } = getRuntimeConfig();
-    if (action !== Action.INJECT && action !== Action.SAVE) {
-        throw new CrossSeedError(`Action method "${action}" is invalid. Allowed choices are "save" and "inject".`);
+function logInjectionResult(result, tracker, name, decision) {
+    const styledName = chalk.green.bold(name);
+    const styledTracker = chalk.bold(tracker);
+    switch (result) {
+        case InjectionResult.SUCCESS:
+            logger.info(`Found ${styledName} on ${styledTracker} by ${decision} - injected`);
+            break;
+        case InjectionResult.ALREADY_EXISTS:
+            logger.info(`Found ${styledName} on ${styledTracker} by ${decision} - exists`);
+            break;
+        case InjectionResult.TORRENT_NOT_COMPLETE:
+            logger.warn(`Found ${styledName} on ${styledTracker} by ${decision} - skipping incomplete torrent`);
+            break;
+        case InjectionResult.FAILURE:
+        default:
+            logger.error(`Found ${styledName} on ${styledTracker} by ${decision} - failed to inject, saving instead`);
+            break;
     }
 }
-export async function performAction(newMeta, decision, searchee, tracker) {
-    const { action, linkDir } = getRuntimeConfig();
-    if (searchee.path) {
-        if (decision == Decision.MATCH) {
-            await linkExact(searchee.path, linkDir);
+/**
+ * @return the root of linked files.
+ */
+function linkExactTree(newMeta, destinationDir, sourceRoot) {
+    if (newMeta.files.length === 1) {
+        return fuzzyLinkOneFile(newMeta, destinationDir, sourceRoot);
+    }
+    for (const newFile of newMeta.files) {
+        const srcFilePath = join(dirname(sourceRoot), newFile.path);
+        const destFilePath = join(destinationDir, newFile.path);
+        mkdirSync(dirname(destFilePath), { recursive: true });
+        linkFile(srcFilePath, destFilePath);
+    }
+    return join(destinationDir, newMeta.name);
+}
+/**
+ * @return the root of linked file.
+ */
+function fuzzyLinkOneFile(newMeta, destinationDir, sourceRoot) {
+    const srcFilePath = sourceRoot;
+    const destFilePath = join(destinationDir, newMeta.files[0].path);
+    mkdirSync(dirname(destFilePath), { recursive: true });
+    linkFile(srcFilePath, destFilePath);
+    return join(destinationDir, newMeta.name);
+}
+/**
+ * @return the root of linked files.
+ */
+function fuzzyLinkPartial(searchee, newMeta, destinationDir, sourceRoot) {
+    for (const newFile of newMeta.files) {
+        let matchedSearcheeFiles = searchee.files.filter((searcheeFile) => searcheeFile.length === newFile.length);
+        if (matchedSearcheeFiles.length > 1) {
+            matchedSearcheeFiles = matchedSearcheeFiles.filter((searcheeFile) => searcheeFile.name === newFile.name);
         }
-        else if (decision == Decision.MATCH_SIZE_ONLY) {
-            // Size only matching is only supported for single file or
-            // single, nested file torrents.
-            const candidateParentDir = dirname(newMeta.files[0].path);
-            let correctedlinkDir = linkDir;
-            // Candidate is single, nested file
-            if (candidateParentDir !== ".") {
-                mkdirSync(join(linkDir, candidateParentDir), {
-                    recursive: true,
-                });
-                correctedlinkDir = join(linkDir, candidateParentDir);
-            }
-            linkFile(searchee.path, join(correctedlinkDir, newMeta.files[0].name));
+        if (matchedSearcheeFiles.length) {
+            const srcFilePath = statSync(sourceRoot).isFile()
+                ? sourceRoot
+                : join(dirname(sourceRoot), matchedSearcheeFiles[0].path);
+            const destFilePath = join(destinationDir, newFile.path);
+            mkdirSync(dirname(destFilePath), { recursive: true });
+            linkFile(srcFilePath, destFilePath);
         }
     }
-    const styledName = chalk.green.bold(newMeta.name);
-    const styledTracker = chalk.bold(tracker);
-    if (action === Action.INJECT) {
-        const result = await getClient().inject(newMeta, searchee, searchee.path ? linkDir : undefined);
-        switch (result) {
-            case InjectionResult.SUCCESS:
-                logger.info(`Found ${styledName} on ${styledTracker} - injected`);
-                break;
-            case InjectionResult.ALREADY_EXISTS:
-                logger.info(`Found ${styledName} on ${styledTracker} - exists`);
-                break;
-            case InjectionResult.TORRENT_NOT_COMPLETE:
-                logger.warn(`Found ${styledName} on ${styledTracker} - skipping incomplete torrent`);
-                break;
-            case InjectionResult.FAILURE:
-            default:
-                logger.error(`Found ${styledName} on ${styledTracker} - failed to inject, saving instead`);
-                saveTorrentFile(tracker, getTag(searchee.name), newMeta);
-                break;
+    return join(destinationDir, newMeta.name);
+}
+async function linkAllFilesInMetafile(searchee, newMeta, tracker, decision) {
+    const { linkDir, flatLinking } = getRuntimeConfig();
+    const fullLinkDir = flatLinking ? linkDir : join(linkDir, tracker);
+    let sourceRoot;
+    if (searchee.path) {
+        sourceRoot = searchee.path;
+    }
+    else {
+        const downloadDirResult = await getClient().getDownloadDir(searchee);
+        if (downloadDirResult.isErr()) {
+            return downloadDirResult.mapErr((e) => e === "NOT_FOUND" ? "TORRENT_NOT_FOUND" : e);
         }
-        return result;
+        sourceRoot = join(downloadDirResult.unwrapOrThrow(), searchee.files.length === 1
+            ? searchee.files[0].path
+            : searchee.name);
+    }
+    if (!existsSync(sourceRoot)) {
+        logger.error(`Linking failed, ${sourceRoot} not found. Make sure Docker volume mounts are set up properly.`);
+        return resultOfErr("MISSING_DATA");
+    }
+    if (decision === Decision.MATCH) {
+        return resultOf(linkExactTree(newMeta, fullLinkDir, sourceRoot));
+    }
+    else if (decision === Decision.MATCH_SIZE_ONLY) {
+        return resultOf(fuzzyLinkOneFile(newMeta, fullLinkDir, sourceRoot));
     }
     else {
-        saveTorrentFile(tracker, getTag(searchee.name), newMeta);
-        logger.info(`Found ${styledName} on ${styledTracker} - saved`);
+        return resultOf(fuzzyLinkPartial(searchee, newMeta, fullLinkDir, sourceRoot));
+    }
+}
+export async function performAction(newMeta, decision, searchee, tracker) {
+    const { action, linkDir } = getRuntimeConfig();
+    const isVideo = hasVideo(searchee);
+    if (action === Action.SAVE) {
+        await saveTorrentFile(tracker, getTag(searchee.name, isVideo), newMeta);
+        const styledName = chalk.green.bold(newMeta.name);
+        const styledTracker = chalk.bold(tracker);
+        logger.info(`Found ${styledName} on ${styledTracker} by ${decision} - saved`);
         return SaveResult.SAVED;
     }
+    let destinationDir;
+    if (linkDir) {
+        const linkedFilesRootResult = await linkAllFilesInMetafile(searchee, newMeta, tracker, decision);
+        if (linkedFilesRootResult.isOk()) {
+            destinationDir = dirname(linkedFilesRootResult.unwrapOrThrow());
+        }
+        else if (decision === Decision.MATCH &&
+            linkedFilesRootResult.unwrapErrOrThrow() === "MISSING_DATA") {
+            logger.warn("Falling back to non-linking.");
+            if (searchee.path) {
+                destinationDir = dirname(searchee.path);
+            }
+        }
+        else {
+            logInjectionResult(InjectionResult.FAILURE, tracker, newMeta.name, decision);
+            await saveTorrentFile(tracker, getTag(searchee.name, isVideo), newMeta);
+            return InjectionResult.FAILURE;
+        }
+    }
+    else if (searchee.path) {
+        // should be a MATCH, as risky requires a linkDir to be set
+        destinationDir = dirname(searchee.path);
+    }
+    const result = await getClient().inject(newMeta, searchee, decision, destinationDir);
+    logInjectionResult(result, tracker, newMeta.name, decision);
+    if (result === InjectionResult.FAILURE) {
+        await saveTorrentFile(tracker, getTag(searchee.name, isVideo), newMeta);
+    }
+    return result;
 }
 export async function performActions(searchee, matches) {
     const results = [];
@@ -73,21 +153,6 @@ export async function performActions(searchee, matches) {
     }
     return results;
 }
-function linkExact(oldPath, newPath) {
-    if (!newPath) {
-        return;
-    }
-    if (statSync(oldPath).isFile()) {
-        if (!existsSync(join(newPath, basename(oldPath)))) {
-            linkFile(oldPath, join(newPath, basename(oldPath)));
-        }
-        return;
-    }
-    mkdirSync(join(newPath, basename(oldPath)), { recursive: true });
-    readdirSync(oldPath).forEach((file) => {
-        linkExact(join(oldPath, file), join(newPath, basename(oldPath)));
-    });
-}
 function linkFile(oldPath, newPath) {
     const { linkType } = getRuntimeConfig();
     try {

package/dist/action.js.map

@@ -1 +1 @@
-{"version":3,"file":"action.js","sourceRoot":"","sources":["../src/action.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"action.js","sourceRoot":"","sources":["../src/action.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,SAAS,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,IAAI,CAAC;AAC5E,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAC9C,OAAO,EAAE,SAAS,EAAE,MAAM,4BAA4B,CAAC;AACvD,OAAO,EACN,MAAM,EAEN,QAAQ,EACR,eAAe,EACf,QAAQ,EACR,UAAU,GACV,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAErC,OAAO,EAAU,QAAQ,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC5D,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAY,QAAQ,EAAE,MAAM,eAAe,CAAC;AACnD,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAC/C,OAAO,EAAE,MAAM,EAAE,MAAM,YAAY,CAAC;AAEpC,SAAS,kBAAkB,CAC1B,MAAuB,EACvB,OAAe,EACf,IAAY,EACZ,QAAkB;IAElB,MAAM,UAAU,GAAG,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC1C,MAAM,aAAa,GAAG,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IAC1C,QAAQ,MAAM,EAAE,CAAC;QAChB,KAAK,eAAe,CAAC,OAAO;YAC3B,MAAM,CAAC,IAAI,CACV,SAAS,UAAU,OAAO,aAAa,OAAO,QAAQ,aAAa,CACnE,CAAC;YACF,MAAM;QACP,KAAK,eAAe,CAAC,cAAc;YAClC,MAAM,CAAC,IAAI,CACV,SAAS,UAAU,OAAO,aAAa,OAAO,QAAQ,WAAW,CACjE,CAAC;YACF,MAAM;QACP,KAAK,eAAe,CAAC,oBAAoB;YACxC,MAAM,CAAC,IAAI,CACV,SAAS,UAAU,OAAO,aAAa,OAAO,QAAQ,gCAAgC,CACtF,CAAC;YACF,MAAM;QACP,KAAK,eAAe,CAAC,OAAO,CAAC;QAC7B;YACC,MAAM,CAAC,KAAK,CACX,SAAS,UAAU,OAAO,aAAa,OAAO,QAAQ,qCAAqC,CAC3F,CAAC;YACF,MAAM;IACR,CAAC;AACF,CAAC;AAED;;GAEG;AACH,SAAS,aAAa,CACrB,OAAiB,EACjB,cAAsB,EACtB,UAAkB;IAElB,IAAI,OAAO,CAAC,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAChC,OAAO,gBAAgB,CAAC,OAAO,EAAE,cAAc,EAAE,UAAU,CAAC,CAAC;IAC9D,CAAC;IACD,KAAK,MAAM,OAAO,IAAI,OAAO,CAAC,KAAK,EAAE,CAAC;QACrC,MAAM,WAAW,GAAG,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;QAC5D,MAAM,YAAY,GAAG,IAAI,CAAC,cAAc,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;QACxD,SAAS,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QACtD,QAAQ,CAAC,WAAW,EAAE,YAAY,CAAC,CAAC;IACrC,CAAC;IACD,OAAO,IAAI,CAAC,cAAc,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;AAC3C,CAAC;AAED;;GAEG;AACH,SAAS,gBAAgB,CACxB,OAAiB,EACjB,cAAsB,EACtB,UAAkB;IAElB,MAAM,WAAW,GAAG,UAAU,CAAC;IAC/B,MAAM,YAAY,GAAG,IAAI,CAAC,cAAc,EAAE,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;IACjE,SAAS,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IACtD,QAAQ,CAAC,WAAW,EAAE,YAAY,CAAC,CAAC;IACpC,OAAO,IAAI,CAAC,cAAc,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;AAC3C,CAAC;AAED;;GAEG;AACH,SAAS,gBAAgB,CACxB,QAAkB,EAClB,OAAiB,EACjB,cAAsB,EACtB,UAAkB;IAElB,KAAK,MAAM,OAAO,IAAI,OAAO,CAAC,KAAK,EAAE,CAAC;QACrC,IAAI,oBAAoB,GAAG,QAAQ,CAAC,KAAK,CAAC,MAAM,CAC/C,CAAC,YAAY,EAAE,EAAE,CAAC,YAAY,CAAC,MAAM,KAAK,OAAO,CAAC,MAAM,CACxD,CAAC;QACF,IAAI,oBAAoB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACrC,oBAAoB,GAAG,oBAAoB,CAAC,MAAM,CACjD,CAAC,YAAY,EAAE,EAAE,CAAC,YAAY,CAAC,IAAI,KAAK,OAAO,CAAC,IAAI,CACpD,CAAC;QACH,CAAC;QACD,IAAI,oBAAoB,CAAC,MAAM,EAAE,CAAC;YACjC,MAAM,WAAW,GAAG,QAAQ,CAAC,UAAU,CAAC,CAAC,MAAM,EAAE;gBAChD,CAAC,CAAC,UAAU;gBACZ,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,oBAAoB,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;YAC3D,MAAM,YAAY,GAAG,IAAI,CAAC,cAAc,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;YACxD,SAAS,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;YACtD,QAAQ,CAAC,WAAW,EAAE,YAAY,CAAC,CAAC;QACrC,CAAC;IACF,CAAC;IACD,OAAO,IAAI,CAAC,cAAc,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;AAC3C,CAAC;AAED,KAAK,UAAU,sBAAsB,CACpC,QAAkB,EAClB,OAAiB,EACjB,OAAe,EACf,QAGyB;IAUzB,MAAM,EAAE,OAAO,EAAE,WAAW,EAAE,GAAG,gBAAgB,EAAE,CAAC;IACpD,MAAM,WAAW,GAAG,WAAW,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IACnE,IAAI,UAAkB,CAAC;IACvB,IAAI,QAAQ,CAAC,IAAI,EAAE,CAAC;QACnB,UAAU,GAAG,QAAQ,CAAC,IAAI,CAAC;IAC5B,CAAC;SAAM,CAAC;QACP,MAAM,iBAAiB,GAAG,MAAM,SAAS,EAAE,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC;QACrE,IAAI,iBAAiB,CAAC,KAAK,EAAE,EAAE,CAAC;YAC/B,OAAO,iBAAiB,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CACrC,CAAC,KAAK,WAAW,CAAC,CAAC,CAAC,mBAAmB,CAAC,CAAC,CAAC,CAAC,CAC3C,CAAC;QACH,CAAC;QACD,UAAU,GAAG,IAAI,CAChB,iBAAiB,CAAC,aAAa,EAAE,EACjC,QAAQ,CAAC,KAAK,CAAC,MAAM,KAAK,CAAC;YAC1B,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI;YACxB,CAAC,CAAC,QAAQ,CAAC,IAAI,CAChB,CAAC;IACH,CAAC;IAED,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE,CAAC;QAC7B,MAAM,CAAC,KAAK,CACX,mBAAmB,UAAU,iEAAiE,CAC9F,CAAC;QACF,OAAO,WAAW,CAAC,cAAc,CAAC,CAAC;IACpC,CAAC;IAED,IAAI,QAAQ,KAAK,QAAQ,CAAC,KAAK,EAAE,CAAC;QACjC,OAAO,QAAQ,CAAC,aAAa,CAAC,OAAO,EAAE,WAAW,EAAE,UAAU,CAAC,CAAC,CAAC;IAClE,CAAC;SAAM,IAAI,QAAQ,KAAK,QAAQ,CAAC,eAAe,EAAE,CAAC;QAClD,OAAO,QAAQ,CAAC,gBAAgB,CAAC,OAAO,EAAE,WAAW,EAAE,UAAU,CAAC,CAAC,CAAC;IACrE,CAAC;SAAM,CAAC;QACP,OAAO,QAAQ,CACd,gBAAgB,CAAC,QAAQ,EAAE,OAAO,EAAE,WAAW,EAAE,UAAU,CAAC,CAC5D,CAAC;IACH,CAAC;AACF,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,aAAa,CAClC,OAAiB,EACjB,QAGyB,EACzB,QAAkB,EAClB,OAAe;IAEf,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,gBAAgB,EAAE,CAAC;IAC/C,MAAM,OAAO,GAAG,QAAQ,CAAC,QAAQ,CAAC,CAAC;IAEnC,IAAI,MAAM,KAAK,MAAM,CAAC,IAAI,EAAE,CAAC;QAC5B,MAAM,eAAe,CAAC,OAAO,EAAE,MAAM,CAAC,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC,EAAE,OAAO,CAAC,CAAC;QACxE,MAAM,UAAU,GAAG,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QAClD,MAAM,aAAa,GAAG,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAC1C,MAAM,CAAC,IAAI,CACV,SAAS,UAAU,OAAO,aAAa,OAAO,QAAQ,UAAU,CAChE,CAAC;QACF,OAAO,UAAU,CAAC,KAAK,CAAC;IACzB,CAAC;IAED,IAAI,cAAkC,CAAC;IAEvC,IAAI,OAAO,EAAE,CAAC;QACb,MAAM,qBAAqB,GAAG,MAAM,sBAAsB,CACzD,QAAQ,EACR,OAAO,EACP,OAAO,EACP,QAAQ,CACR,CAAC;QACF,IAAI,qBAAqB,CAAC,IAAI,EAAE,EAAE,CAAC;YAClC,cAAc,GAAG,OAAO,CAAC,qBAAqB,CAAC,aAAa,EAAE,CAAC,CAAC;QACjE,CAAC;aAAM,IACN,QAAQ,KAAK,QAAQ,CAAC,KAAK;YAC3B,qBAAqB,CAAC,gBAAgB,EAAE,KAAK,cAAc,EAC1D,CAAC;YACF,MAAM,CAAC,IAAI,CAAC,8BAA8B,CAAC,CAAC;YAC5C,IAAI,QAAQ,CAAC,IAAI,EAAE,CAAC;gBACnB,cAAc,GAAG,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;YACzC,CAAC;QACF,CAAC;aAAM,CAAC;YACP,kBAAkB,CACjB,eAAe,CAAC,OAAO,EACvB,OAAO,EACP,OAAO,CAAC,IAAI,EACZ,QAAQ,CACR,CAAC;YACF,MAAM,eAAe,CACpB,OAAO,EACP,MAAM,CAAC,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC,EAC9B,OAAO,CACP,CAAC;YACF,OAAO,eAAe,CAAC,OAAO,CAAC;QAChC,CAAC;IACF,CAAC;SAAM,IAAI,QAAQ,CAAC,IAAI,EAAE,CAAC;QAC1B,2DAA2D;QAC3D,cAAc,GAAG,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;IACzC,CAAC;IACD,MAAM,MAAM,GAAG,MAAM,SAAS,EAAE,CAAC,MAAM,CACtC,OAAO,EACP,QAAQ,EACR,QAAQ,EACR,cAAc,CACd,CAAC;IAEF,kBAAkB,CAAC,MAAM,EAAE,OAAO,EAAE,OAAO,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;IAC5D,IAAI,MAAM,KAAK,eAAe,CAAC,OAAO,EAAE,CAAC;QACxC,MAAM,eAAe,CAAC,OAAO,EAAE,MAAM,CAAC,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC,EAAE,OAAO,CAAC,CAAC;IACzE,CAAC;IACD,OAAO,MAAM,CAAC;AACf,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,cAAc,CAAC,QAAQ,EAAE,OAAO;IACrD,MAAM,OAAO,GAAmB,EAAE,CAAC;IACnC,KAAK,MAAM,EAAE,OAAO,EAAE,UAAU,EAAE,IAAI,OAAO,EAAE,CAAC;QAC/C,MAAM,MAAM,GAAG,MAAM,aAAa,CACjC,UAAU,CAAC,QAAQ,EACnB,UAAU,CAAC,QAAQ,EACnB,QAAQ,EACR,OAAO,CACP,CAAC;QACF,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACrB,IAAI,MAAM,KAAK,eAAe,CAAC,oBAAoB;YAAE,MAAM;IAC5D,CAAC;IACD,OAAO,OAAO,CAAC;AAChB,CAAC;AAED,SAAS,QAAQ,CAAC,OAAe,EAAE,OAAe;IACjD,MAAM,EAAE,QAAQ,EAAE,GAAG,gBAAgB,EAAE,CAAC;IACxC,IAAI,CAAC;QACJ,IAAI,QAAQ,KAAK,QAAQ,CAAC,QAAQ,EAAE,CAAC;YACpC,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QAC5B,CAAC;aAAM,CAAC;YACP,2DAA2D;YAC3D,gDAAgD;YAChD,WAAW,CAAC,OAAO,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC;QACxC,CAAC;IACF,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACZ,IAAI,CAAC,CAAC,IAAI,KAAK,QAAQ;YAAE,OAAO;QAChC,MAAM,CAAC,CAAC;IACT,CAAC;AACF,CAAC"}

package/dist/auth.js

@@ -9,17 +9,17 @@ export async function resetApiKey() {
     await db("settings").update({ apikey });
     return apikey;
 }
-export async function getApiKeyFromDatabase() {
+export async function getApiKey() {
+    const { apiKey: runtimeConfigApiKey } = getRuntimeConfig();
+    if (runtimeConfigApiKey)
+        return runtimeConfigApiKey;
     const { apikey } = await db("settings").select("apikey").first();
     if (!apikey)
         return resetApiKey();
     return apikey;
 }
 export async function checkApiKey(keyToCheck) {
-    const { apiAuth } = getRuntimeConfig();
-    if (!apiAuth)
-        return true;
-    const apikey = await getApiKeyFromDatabase();
+    const apikey = await getApiKey();
     return apikey === keyToCheck;
 }
 //# sourceMappingURL=auth.js.map

package/dist/auth.js.map

@@ -1 +1 @@
-{"version":3,"file":"auth.js","sourceRoot":"","sources":["../src/auth.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,EAAE,EAAE,EAAE,MAAM,SAAS,CAAC;AAC7B,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAEtD,SAAS,cAAc;IACtB,OAAO,WAAW,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;AACxC,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,WAAW;IAChC,MAAM,MAAM,GAAG,cAAc,EAAE,CAAC;IAChC,MAAM,EAAE,CAAC,UAAU,CAAC,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC;IACxC,OAAO,MAAM,CAAC;AACf,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,qBAAqB;IAC1C,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE,CAAC,UAAU,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,KAAK,EAAE,CAAC;IACjE,IAAI,CAAC,MAAM;QAAE,OAAO,WAAW,EAAE,CAAC;IAClC,OAAO,MAAM,CAAC;AACf,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,WAAW,CAAC,UAAkB;IACnD,MAAM,EAAE,OAAO,EAAE,GAAG,gBAAgB,EAAE,CAAC;IACvC,IAAI,CAAC,OAAO;QAAE,OAAO,IAAI,CAAC;IAC1B,MAAM,MAAM,GAAG,MAAM,qBAAqB,EAAE,CAAC;IAC7C,OAAO,MAAM,KAAK,UAAU,CAAC;AAC9B,CAAC"}
+{"version":3,"file":"auth.js","sourceRoot":"","sources":["../src/auth.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,EAAE,EAAE,EAAE,MAAM,SAAS,CAAC;AAC7B,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAEtD,SAAS,cAAc;IACtB,OAAO,WAAW,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;AACxC,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,WAAW;IAChC,MAAM,MAAM,GAAG,cAAc,EAAE,CAAC;IAChC,MAAM,EAAE,CAAC,UAAU,CAAC,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC;IACxC,OAAO,MAAM,CAAC;AACf,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,SAAS;IAC9B,MAAM,EAAE,MAAM,EAAE,mBAAmB,EAAE,GAAG,gBAAgB,EAAE,CAAC;IAC3D,IAAI,mBAAmB;QAAE,OAAO,mBAAmB,CAAC;IAEpD,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE,CAAC,UAAU,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,KAAK,EAAE,CAAC;IACjE,IAAI,CAAC,MAAM;QAAE,OAAO,WAAW,EAAE,CAAC;IAClC,OAAO,MAAM,CAAC;AACf,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,WAAW,CAAC,UAAkB;IACnD,MAAM,MAAM,GAAG,MAAM,SAAS,EAAE,CAAC;IACjC,OAAO,MAAM,KAAK,UAAU,CAAC;AAC9B,CAAC"}

package/dist/clients/Deluge.js

@@ -1,9 +1,10 @@
-import { InjectionResult } from "../constants.js";
+import { InjectionResult, TORRENT_TAG, TORRENT_CATEGORY_SUFFIX, } from "../constants.js";
 import { CrossSeedError } from "../errors.js";
 import { Label, logger } from "../logger.js";
 import { getRuntimeConfig } from "../runtimeConfig.js";
-import { extractCredentialsFromUrl } from "../utils.js";
-import fetch, { Headers } from "node-fetch";
+import { shouldRecheck, extractCredentialsFromUrl, wait } from "../utils.js";
+import { resultOf, resultOfErr } from "../Result.js";
+import ms from "ms";
 var DelugeErrorCode;
 (function (DelugeErrorCode) {
     DelugeErrorCode[DelugeErrorCode["NO_AUTH"] = 1] = "NO_AUTH";
@@ -13,10 +14,11 @@ var DelugeErrorCode;
     DelugeErrorCode[DelugeErrorCode["BAD_JSON"] = 5] = "BAD_JSON";
 })(DelugeErrorCode || (DelugeErrorCode = {}));
 export default class Deluge {
-    constructor() {
-        this.delugeCookie = null;
-        this.delugeLabel = "cross-seed";
-    }
+    delugeCookie = null;
+    delugeLabel = TORRENT_TAG;
+    delugeLabelSuffix = TORRENT_CATEGORY_SUFFIX;
+    isLabelEnabled;
+    delugeRequestId = 0;
     /**
      * validates the login and host for deluge webui
      */
@@ -65,26 +67,30 @@ export default class Deluge {
         if (this.delugeCookie)
             headers.set("Cookie", this.delugeCookie);
         let response, json;
-        const id = Math.floor(Math.random() * 0x7fffffff);
+        const abortController = new AbortController();
+        setTimeout(() => void abortController.abort(), ms("10 seconds")).unref();
         try {
             response = await fetch(href, {
                 body: JSON.stringify({
                     method,
                     params,
-                    id,
+                    id: this.delugeRequestId++,
                 }),
                 method: "POST",
                 headers,
+                signal: abortController.signal,
             });
         }
         catch (networkError) {
-            // @ts-expect-error needs es2022 target (tsconfig)
+            if (networkError.name === "AbortError") {
+                throw new Error(`Deluge method ${method} timed out after 10 seconds`);
+            }
             throw new Error(`Failed to connect to Deluge at ${href}`, {
                 cause: networkError,
             });
         }
         try {
-            json = await response.json();
+            json = (await response.json());
         }
         catch (jsonParseError) {
             throw new Error(`Deluge method ${method} response was non-JSON ${jsonParseError}`);
@@ -96,7 +102,7 @@ export default class Deluge {
                 return this.call(method, params, 0);
             }
             else {
-                throw new Error("Connection lost with Deluge. Reauthentication failed.");
+                throw new Error("Connection lost with Deluge. Re-authentication failed.");
             }
         }
         this.handleResponseHeaders(response.headers);
@@ -120,12 +126,32 @@ export default class Deluge {
             ? false
             : enabledPlugins.result.includes("Label");
     }
+    // generates the label (string) for injection based on searchee and torrentInfo
+    calculateLabel(searchee, torrentInfo) {
+        const { linkCategory, duplicateCategories } = getRuntimeConfig();
+        if (!searchee.infoHash || !torrentInfo.label) {
+            return this.delugeLabel;
+        }
+        const ogLabel = torrentInfo.label;
+        if (!duplicateCategories) {
+            return ogLabel;
+        }
+        const shouldSuffixLabel = !ogLabel.endsWith(this.delugeLabelSuffix) && // no .cross-seed
+            ogLabel !== linkCategory; // not data
+        return searchee.path
+            ? linkCategory
+            : shouldSuffixLabel
+                ? `${ogLabel}${this.delugeLabelSuffix}`
+                : ogLabel;
+    }
     /**
      * if Label plugin is loaded, adds (if necessary)
      * and sets the label based on torrent hash.
      */
-    async setLabel(infoHash, label) {
-        if (this.isLabelEnabled) {
+    async setLabel(name, infoHash, label) {
+        if (!this.isLabelEnabled)
+            return;
+        try {
             const setResult = await this.call("label.set_torrent", [
                 infoHash,
                 label,
@@ -135,14 +161,19 @@ export default class Deluge {
                 await this.call("label.set_torrent", [infoHash, label]);
             }
         }
+        catch (e) {
+            logger.warn({
+                label: Label.DELUGE,
+                message: `Failed to label ${name} (${infoHash}) as ${label}`,
+            });
+        }
     }
     /**
      * injects a torrent into deluge client
      */
-    async inject(newTorrent, searchee, path) {
+    async inject(newTorrent, searchee, decision, path) {
         try {
             let torrentInfo;
-            const { duplicateCategories } = getRuntimeConfig();
             if (searchee.infoHash) {
                 torrentInfo = await this.getTorrentInfo(searchee);
                 if (!torrentInfo.complete) {
@@ -156,28 +187,33 @@ export default class Deluge {
                 });
                 return InjectionResult.FAILURE;
             }
-            const params = this.formatData(`${newTorrent.getFileSystemSafeName()}.cross-seed.torrent`, newTorrent.encode().toString("base64"), path ? path : torrentInfo.save_path, !!searchee.infoHash);
+            const torrentFileName = `${newTorrent.getFileSystemSafeName()}.cross-seed.torrent`;
+            const encodedTorrentData = newTorrent.encode().toString("base64");
+            const torrentPath = path ? path : torrentInfo.save_path;
+            const params = this.formatData(torrentFileName, encodedTorrentData, torrentPath, decision);
             const addResult = await this.call("core.add_torrent_file", params);
-            if (addResult.result) {
-                const { dataCategory } = getRuntimeConfig();
-                await this.setLabel(newTorrent.infoHash, searchee.path
-                    ? dataCategory
-                    : torrentInfo.label
-                        ? duplicateCategories
-                            ? torrentInfo.label.endsWith(".cross-seed")
-                                ? torrentInfo.label
-                                : `${torrentInfo.label}.cross-seed`
-                            : torrentInfo.label
-                        : this.delugeLabel);
+            const addResponse = typeof addResult.error?.message === "string"
+                ? addResult.error
+                : addResult.result;
+            if (typeof addResponse === "string") {
+                await this.setLabel(newTorrent.name, newTorrent.infoHash, this.calculateLabel(searchee, torrentInfo));
+                if (shouldRecheck(decision)) {
+                    // when paused, libtorrent doesnt start rechecking
+                    // leaves torrent ready to download - ~99%
+                    await wait(1000);
+                    await this.call("core.force_recheck", [
+                        [newTorrent.infoHash],
+                    ]);
+                }
                 return InjectionResult.SUCCESS;
             }
-            else if (addResult.error.message.includes("already")) {
+            else if (addResponse?.message.includes("already")) {
                 return InjectionResult.ALREADY_EXISTS;
             }
-            else if (addResult.error.message) {
+            else if (addResponse) {
                 logger.debug({
                     label: Label.DELUGE,
-                    message: `Injection failed: ${addResult.error.message}`,
+                    message: `Injection failed: ${addResponse}`,
                 });
                 return InjectionResult.FAILURE;
             }
@@ -189,38 +225,56 @@ export default class Deluge {
                 return InjectionResult.FAILURE;
             }
         }
-        catch (injectResult) {
-            if (injectResult.includes("label.set_torrent")) {
-                logger.warning({
-                    label: Label.DELUGE,
-                    message: `Labeling failure: ${newTorrent.name} (${newTorrent.infoHash})`,
-                });
-                return InjectionResult.SUCCESS;
-            }
-            else {
-                logger.error({
-                    label: Label.DELUGE,
-                    message: `Injection failed: ${injectResult}`,
-                });
-                logger.debug(injectResult);
-                return InjectionResult.FAILURE;
-            }
+        catch (error) {
+            logger.error({
+                label: Label.DELUGE,
+                message: `Injection failed: ${error}`,
+            });
+            logger.debug(error);
+            return InjectionResult.FAILURE;
         }
     }
     /**
      * formats the json for rpc calls to inject
      */
-    formatData(filename, filedump, path, isTorrent) {
+    formatData(filename, filedump, path, decision) {
+        const toRecheck = shouldRecheck(decision);
         return [
             filename,
             filedump,
             {
-                add_paused: isTorrent ? false : !getRuntimeConfig().skipRecheck,
-                seed_mode: isTorrent ? true : getRuntimeConfig().skipRecheck,
+                add_paused: toRecheck,
+                seed_mode: !toRecheck,
                 download_location: path,
             },
         ];
     }
+    /**
+     * returns directory of an infohash in deluge as a string
+     */
+    async getDownloadDir(searchee) {
+        let torrent, response;
+        const params = [["save_path", "progress"], { hash: searchee.infoHash }];
+        try {
+            response = await this.call("web.update_ui", params);
+        }
+        catch (e) {
+            return resultOfErr("UNKNOWN_ERROR");
+        }
+        if (response.result.torrents) {
+            torrent = response.result.torrents?.[searchee.infoHash];
+        }
+        else {
+            return resultOfErr("UNKNOWN_ERROR");
+        }
+        if (torrent === undefined) {
+            return resultOfErr("NOT_FOUND");
+        }
+        else if (response.result.torrents?.[searchee.infoHash].progress !== 100) {
+            return resultOfErr("TORRENT_NOT_COMPLETE");
+        }
+        return resultOf(torrent.save_path);
+    }
     /**
      * returns information needed to complete/validate injection
      */
@@ -260,7 +314,6 @@ export default class Deluge {
                 message: `Failed to fetch torrent data: ${searchee.name} - (${searchee.infoHash})`,
             });
             logger.debug(e);
-            // @ts-expect-error needs es2022 target (tsconfig)
             throw new Error("web.update_ui: failed to fetch data from client", {
                 cause: e,
             });