Merge branch 'master' into rss-prefilter

CONTRIRUTING.md

@@ -0,0 +1,38 @@
+# Writing code
+
+1. Download VS Code. it has typescript support out of the box, but any ide will
+   do. recommend downloading a typescript plugin if needed
+2. clone repo
+3. open repo in vs code
+4. run npm install
+5. start coding :)
+
+the code is in /src cmd.js is the entrypoint pipeline.js is the interesting high
+level functions (doRss, etc...)
+
+# Build and Run
+
+`npm run build` will compile the typescript files into javascript files in /dist
+`npm run watch` will compile, then incrementally compile when files change the
+`cross-seed` command is an alias for `node dist/cmd.js`, as in
+`node dist/cmd.js daemon` but it's annoying to use the cross-seed alias while
+developing so i use a lot of ctrl-R with fzf
+
+# Testing
+
+I keep a `config.js` that points to
+`{ torrentDir: "./input", outputDir: "./output" }` and put some torrent files in
+`./input` I usually run in search mode because it's the simplest form of
+cross-seed and most work applies to it.
+
+## testing daemon mode
+
+have three terminals open, one for npm run watch, one for keeping the cross-seed
+daemon open, and one for curling to localhost:2468
+
+## testing direct injection
+
+mostly i stick with `--save` (the default i think) usually i use docker to run
+whichever client. you could install it yourself though I have a gitignored
+docker_compose.yml that keeps track of all of the clients but i only run them
+one at a time

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "cross-seed",
-	"version": "5.4.3",
+	"version": "5.4.5",
 	"description": "Query Jackett for cross-seedable torrents",
 	"scripts": {
 		"test": "true",

src/config.template.cjs

@@ -156,6 +156,8 @@ module.exports = {
 	 * cross-seed will send POST requests to this url
 	 * with a JSON payload of { title, body }.
 	 * Conforms to the caronc/apprise REST API.
+	 * If necessary, supply your username and password inside the url like so:
+	 * "http://username:password@localhost:8000/notify/cross-seed"
 	 */
 	notificationWebhookUrl: undefined,
 

src/config.template.docker.cjs

@@ -160,6 +160,8 @@ module.exports = {
 	 * cross-seed will send POST requests to this url
 	 * with a JSON payload of { title, body }.
 	 * Conforms to the caronc/apprise REST API.
+	 * If necessary, supply your username and password inside the url like so:
+	 * "http://username:password@localhost:8000/notify/cross-seed"
 	 */
 	notificationWebhookUrl: undefined,
 

src/constants.ts

@@ -6,11 +6,11 @@ export const PROGRAM_NAME = packageDotJson.name;
 export const PROGRAM_VERSION = packageDotJson.version;
 export const USER_AGENT = `CrossSeed/${PROGRAM_VERSION}`;
 
-export const EP_REGEX = /^(?<title>.+)[. ](?<season>S\d+)(?<episode>E\d+)/i;
+export const EP_REGEX = /^(?<title>.+?)[\s._](?<season>S\d+)?[_.\s]?(?<episode>E\d+(?:[-\s]?E?\d+)?)/i;
 export const SEASON_REGEX =
-	/^(?<title>.+)[. ](?<season>S\d+)(?:\s?-\s?(?<seasonmax>S?\d+))?(?!E\d+)/i;
+	/^(?<title>.+?)[_.\s](?<season>S\d+)(?:[.\-\s]*?(?<seasonmax>S?\d+))?(?=[_.\s](?!E\d+))/i;
 export const MOVIE_REGEX =
-	/^(?<title>.+)[. ][[(]?(?<year>\d{4})[)\]]?(?![pi])/i;
+	/^(?<title>.+?)[._\s][[(]?(?<year>\d{4})[)\]]?(?![pi])/i;
 
 export const VIDEO_EXTENSIONS = [".mkv", ".mp4", ".avi"];
 

src/pushNotifier.ts

@@ -20,19 +20,54 @@ interface PushNotification {
 
 export class PushNotifier {
 	url: string;
-	constructor(url: string) {
+	username: string | undefined;
+	password: string | undefined;
+
+	constructor(url: string)  {
+		const urlObj = new URL(url);
+
+		if (urlObj.username && urlObj.password) {
+			this.username = urlObj.username;
+			this.password = urlObj.password;
+
+			// Remove the username and password from the URL
+			urlObj.username = "";
+			urlObj.password = "";
+
+			this.url = urlObj.toString();
+		} else {
 		this.url = url;
+		}
 	}
 
-	notify({ title = "cross-seed", body, ...rest }: PushNotification): void {
+	async notify({ title = "cross-seed", body, ...rest }: PushNotification): Promise<void> {
 		if (this.url) {
-			fetch(this.url, {
-				method: "POST",
-				headers: { "Content-Type": "application/json" },
-				body: JSON.stringify({ title, body, ...rest }),
-			}).catch(() => {
-				logger.error({ message: "Failed to send push notification" });
-			});
+			const headers = new Headers();
+			headers.append("Content-Type", "application/json");
+
+			if (this.username && this.password) {
+				const credentials = `${this.username}:${this.password}`;
+				const basicAuth = "Basic " + btoa(credentials);
+				headers.append("Authorization", basicAuth);
+			}
+
+			logger.verbose(`Notification request send to ${this.url}`);
+
+			try {
+				const response = await fetch(this.url, {
+					method: "POST",
+					headers,
+					body: JSON.stringify({ title, body, ...rest }),
+				});
+
+				const responseText = await response.text();
+				response.ok
+					? logger.verbose(`Notifiaction server response:\n${responseText}`)
+					: logger.error(`Notifiaction server error: ${response.status}, ${response.statusText}`);
+
+			} catch (error) {
+				logger.error({ message: "Failed to send push notification", error });
+			}
 		}
 	}
 }

src/torznab.ts

@@ -1,7 +1,7 @@
 import ms from "ms";
 import fetch from "node-fetch";
 import xml2js from "xml2js";
-import { EP_REGEX, SEASON_REGEX } from "./constants.js";
+import { EP_REGEX, SEASON_REGEX, USER_AGENT } from "./constants.js";
 import { db } from "./db.js";
 import { CrossSeedError } from "./errors.js";
 import {
@@ -21,7 +21,6 @@ import {
 	reformatTitleForSearching,
 	stripExtension,
 } from "./utils.js";
-import { USER_AGENT } from "./constants.js";
 
 interface TorznabParams {
 	t: "caps" | "search" | "tvsearch" | "movie";
@@ -463,26 +462,35 @@ async function makeRequests(
 			})
 				.then((response) => {
 					if (!response.ok) {
-						if (response.status === 429) {
+						const retryAfterSeconds = Number(
+							response.headers.get("Retry-After")
+						);
+
+						if (!Number.isNaN(retryAfterSeconds)) {
 							updateIndexerStatus(
-								IndexerStatus.RATE_LIMITED,
-								Date.now() + ms("1 hour"),
+								response.status === 429
+									? IndexerStatus.RATE_LIMITED
+									: IndexerStatus.UNKNOWN_ERROR,
+								Date.now() + ms(`${retryAfterSeconds} seconds`),
 								[indexers[i].id]
 							);
 						} else {
 							updateIndexerStatus(
-								IndexerStatus.UNKNOWN_ERROR,
-								Date.now() + ms("1 hour"),
+								response.status === 429
+									? IndexerStatus.RATE_LIMITED
+									: IndexerStatus.UNKNOWN_ERROR,
+								response.status === 429
+									? Date.now() + ms("1 hour")
+									: Date.now() + ms("10 minutes"),
 								[indexers[i].id]
 							);
 						}
 						throw new Error(
 							`request failed with code: ${response.status}`
 						);
 					}
-					return response;
+					return response.text();
 				})
-				.then((r) => r.text())
 				.then(xml2js.parseStringPromise)
 				.then(parseTorznabResults)
 		)