all-debrid-api 1.1.0 → 1.3.0

package/lib/AllDebridClient.js

@@ -1,37 +1,35 @@
 'use strict'
 
 const fs = require('fs')
-const request = require('request')
+const axios = require('axios')
 
 class AllDebridClient {
 
 	constructor (token, defaultOptions = {}) {
-
 		this.token = token
+		this.ip = defaultOptions.ip
 		this.base_agent = defaultOptions.base_agent || 'node-all-debrid'
-		this.base_url = defaultOptions.base_url || 'https://api.alldebrid.com/v4/'
+		this.base_url = defaultOptions.base_url || 'https://api.alldebrid.com'
 		this.defaultOptions = defaultOptions
+		delete this.defaultOptions.ip
 		delete this.defaultOptions.base_agent
 		delete this.defaultOptions.base_url
 		this._initMethods()
-
 	}
 
 	_readFile (path) {
-
 		return fs.createReadStream(path)
-
 	}
 
 	_request (endpoint, o = {}) {
-
 		const url = this.base_url + endpoint
 
-		const options = Object.assign({}, this.defaultOptions)
+		const options = { ...this.defaultOptions }
 		options.url = url
 		options.json = true
-		options.qs = o.qs || {}
-		options.qs.agent = this.base_agent
+		options.params = o.params || {}
+		options.params.ip = this.ip
+		options.params.agent = this.base_agent
 		options.headers = options.headers || {}
 		options.headers['Authorization'] = 'Bearer ' + this.token
 
@@ -39,29 +37,9 @@ class AllDebridClient {
 			options[i] = o[i]
 		}
 
-		return new Promise((resolve, reject) => {
-
-			request(options, (error, response, body) => {
-				if (error) {
-					reject(error)
-				} else {
-					if (typeof body !== 'undefined') {
-						if (options.binary) body = JSON.parse(body)
-						if (body.status === 'error') {
-							reject(body.error)
-						} else {
-							resolve(body)
-						}
-					} else if (response.statusCode === 200) {
-						resolve()
-					} else {
-						reject()
-					}
-				}
-			})
-
-		})
-
+		return axios.request(options)
+			.then(response => response.data)
+			.catch(error => Promise.reject(error?.response?.data || error))
 	}
 
 	_get (endpoint, options = {}) {
@@ -77,11 +55,11 @@ class AllDebridClient {
 	_initMethods () {
 		this.pin = {
 			get: () => {
-				return this._get('pin/get')
+				return this._get('/v4.1/pin/get')
 			},
 			check: (check, pin) => {
-				return this._get('pin/check', {
-					qs: {
+				return this._get('/v4/pin/check', {
+					params: {
 						check,
 						pin
 					}
@@ -91,94 +69,94 @@ class AllDebridClient {
 
 		this.hosts = {
 			supported: (hostsOnly = null) => {
-				return this._get('hosts', {
-					qs: {
+				return this._get('/v4/hosts', {
+					params: {
 						hostsOnly
 					}
 				})
 			},
 			domains: () => {
-				return this._get('hosts/domains')
+				return this._get('/v4/hosts/domains')
 			},
 			regexp: () => {
-				return this._get('hosts/regexp')
+				return this._get('/v4/hosts/regexp')
 			},
 			priority: () => {
-				return this._get('hosts/priority')
+				return this._get('/v4/hosts/priority')
 			},
 		}
 
 		this.user = {
 			info: () => {
-				return this._get('user')
+				return this._get('/v4/user')
 			},
 			hosts: (hostsOnly = null) => {
-				return this._get('user/hosts', {
-					qs: {
+				return this._get('/v4.1/user/hosts', {
+					params: {
 						hostsOnly
 					}
 				})
 			},
 			links: () => {
-				return this._get('user/links')
+				return this._get('/v4/user/links')
 			},
 			saveLink: (link) => {
-				return this._get('user/links/save', {
-					qs: {
+				return this._get('/v4/user/links/save', {
+					params: {
 						link
 					}
 				})
 			},
 			deleteLink: (link) => {
-				return this._get('user/links/delete', {
-					qs: {
+				return this._get('/v4/user/links/delete', {
+					params: {
 						link
 					}
 				})
 			},
 			recentLinks: () => {
-				return this._get('user/history')
+				return this._get('/v4/user/history')
 			},
 			purgeRecentLinks: () => {
-				return this._get('user/history/delete')
+				return this._get('/v4/user/history/delete')
 			}
 		}
 
 		this.link = {
 			infos: (link, password = null) => {
-				return this._get('link/infos', {
-					qs: {
+				return this._get('/v4/link/infos', {
+					params: {
 						link,
 						password
 					}
 				})
 			},
 			redirector: (link) => {
-				return this._get('link/redirector', {
-					qs: {
+				return this._get('/v4/link/redirector', {
+					params: {
 						link
 					}
 				})
 			},
 			unlock: (link, password = null) => {
-				return this._get('link/unlock', {
-					qs: {
+				return this._get('/v4/link/unlock', {
+					params: {
 						link,
 						password
 					}
 				})
 			},
 			streaming: (id, stream) => {
-				return this._get('link/streaming', {
-					qs: {
+				return this._get('/v4/link/streaming', {
+					params: {
 						id,
 						stream
 					}
 				})
 			},
 			delayed: (id) => {
-				return this._get('link/delayed', {
-					qs: {
+				return this._get('/v4/link/delayed', {
+					params: {
 						id
 					}
 				})
@@ -187,48 +165,47 @@ class AllDebridClient {
 
 		this.magnet = {
 			upload: (magnets) => {
-				return this._post('magnet/upload', {
-					form: {
+				return this._post('/v4/magnet/upload', {
+					data: {
 						magnets
+					},
+					headers: {
+						'Content-Type': 'multipart/form-data'
 					}
 				})
 			},
 			uploadFile: (file) => {
 				const stream = (file.Readable) ? file : this._readFile(file)
-				return this._post('magnet/upload/file', {
-					form: {
+				return this._post('/v4/magnet/upload/file', {
+					data: {
 						files: [stream],
+					},
+					headers: {
+						'Content-Type': 'multipart/form-data'
 					}
 				})
 			},
 			status: (id) => {
-				return this._get('magnet/status', {
-					qs: {
+				return this._get('/v4.1/magnet/status', {
+					params: {
 						id
 					}
 				})
 			},
 			delete: (id) => {
-				return this._get('magnet/delete', {
-					qs: {
+				return this._get('/v4/magnet/delete', {
+					params: {
 						id
 					}
 				})
 			},
 			restart: (id) => {
-				return this._get('magnet/restart', {
-					qs: {
+				return this._get('/v4/magnet/restart', {
+					params: {
 						id
 					}
 				})
 			},
-			instant: (magnets) => {
-				return this._post('magnet/instant', {
-					form: {
-						magnets
-					}
-				})
-			},
 		}
 
 	}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "all-debrid-api",
-	"version": "1.1.0",
+	"version": "1.3.0",
 	"description": "Node AllDebrid API wrapper",
 	"main": "index.js",
 	"directories": {
@@ -21,6 +21,6 @@
 	},
 	"homepage": "https://github.com/TheBeastLT/node-all-debrid#readme",
 	"dependencies": {
-		"request": "^2.83.0"
+		"axios": "^1.13.2"
 	}
 }