@xriss/weerss 0.0.27 → 0.0.29

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@xriss/weerss",
-	"version": "0.0.27",
+	"version": "0.0.29",
 	"source": "weerss.js",
 	"type": "module",
 	"repository": {

package/torrents.js

@@ -11,9 +11,6 @@ import WebTorrent from 'webtorrent'
 import { remote } from 'parse-torrent'
 import memchunks from 'memory-chunk-store'
 
-
-
-
 torrents.get=async function(url) // always slow
 {
 	return await db.get("torrents",url)
@@ -30,6 +27,23 @@ torrents.fetch=async function(url)
 	let ret = await torrents.get(url)
 	if( ret && ret.data) { return ret.data }
 	
+
+	// resolve url ( which may redirect to a magnet, damn you jacket )
+	while(url.toLowerCase().startsWith("http"))
+	{
+		let r=await fetch(url, { redirect: 'manual' })
+		if( r && r.status>=300 && r.status<=399  )
+		{ 
+			let location=r.headers.get("location")
+			if(url==location) { break }
+			url=location
+		}
+		else // finished
+		{
+			break
+		}
+	}
+
 	let urlplus=url
 	if(urlplus.toLowerCase().startsWith("magnet:")) // auto add trackers
 	{
@@ -46,11 +60,14 @@ torrents.fetch=async function(url)
 			}
 		}
 	}
+	else // follow redirects
+	{
+	}
 //	console.log(urlplus)
 	
 	let torrent_parse=function(url) {
 		return new Promise(function(resolve, reject) {
-			remote(url, { timeout: 60 * 1000 }, function(err, parsedTorrent){
+			remote(url, { timeout: 60 * 1000 , followRedirects: true }, function(err, parsedTorrent){
 				if (err) { reject(err) }
 				resolve(parsedTorrent)
 			})

package/weerss.js

@@ -272,7 +272,7 @@ weerss.getlist=async function(filters)
 		{
 			if(!item.show.date) { return false }
 			let now=(new Date()).getTime()
-			let test=Date.parse(it.show.date)
+			let test=Date.parse(item.show.date)
 			let days=Math.floor((now-test)/(1000*60*60*24))
 			if( days > weerss.config.episode.maxage ) { return false } // this episode is too old
 		}