@ctrl/plex 2.1.0 → 3.0.0

package/dist/src/client.d.ts

@@ -67,6 +67,7 @@ export declare class PlexClient {
     platform?: string;
     platformVersion?: string;
     title?: string;
+    timeout: number;
     constructor(options?: PlexOptions);
     /**
      * Alias of reload as any subsequent requests to this client will be
@@ -74,7 +75,7 @@ export declare class PlexClient {
      * populated from a PlexServer.
      * @param timeout
      */
-    connect(timeout?: number): Promise<void>;
+    connect(): Promise<void>;
     /**
      * @alias PlexClient.connect
      */
@@ -89,7 +90,7 @@ export declare class PlexClient {
      * @param headers
      * @param timeout
      */
-    query<T>(path: string, method?: 'get' | 'post' | 'put' | 'patch' | 'head' | 'delete', headers?: Record<string, string>, timeout?: number): Promise<T>;
+    query<T>(path: string, method?: 'get' | 'post' | 'put' | 'patch' | 'head' | 'delete', headers?: Record<string, string>): Promise<T>;
     /**
      * Build a URL string with proper token argument. Token will be appended to the URL
      * if either includeToken is True or TODO: CONFIG.log.show_secrets is 'true'.

package/dist/src/client.js

@@ -1,5 +1,5 @@
 import { URL, URLSearchParams } from 'url';
-import got from 'got';
+import { ofetch } from 'ofetch';
 import { BASE_HEADERS, TIMEOUT } from './config.js';
 /**
  * Main class for interacting with a Plex client. This class can connect
@@ -53,6 +53,7 @@ export class PlexClient {
         }
         this._baseurl = options.baseurl ?? 'http://localhost:32400';
         this._token = options.token ?? null;
+        this.timeout = options.timeout ?? TIMEOUT;
     }
     /**
      * Alias of reload as any subsequent requests to this client will be
@@ -60,8 +61,8 @@ export class PlexClient {
      * populated from a PlexServer.
      * @param timeout
      */
-    async connect(timeout) {
-        const data = await this.query(this.key, undefined, undefined, timeout);
+    async connect() {
+        const data = await this.query(this.key);
         this._loadData(data.MediaContainer.Player);
     }
     /**
@@ -80,15 +81,15 @@ export class PlexClient {
      * @param headers
      * @param timeout
      */
-    async query(path, method = 'get', headers, timeout) {
+    async query(path, method = 'get', headers) {
         const headersObj = this.headers(headers);
-        const response = await got({
+        const response = await ofetch(this.url(path).toString(), {
             method,
-            url: this.url(path),
-            timeout: { request: timeout ?? TIMEOUT },
+            timeout: this.timeout ?? TIMEOUT,
             headers: headersObj,
-            retry: { limit: 0 },
-        }).json();
+            responseType: 'json',
+            retry: 0,
+        });
         return response;
     }
     /**
@@ -128,6 +129,7 @@ export class PlexClient {
         const headersObj = {
             ...BASE_HEADERS,
             ...headers,
+            accept: 'application/json',
         };
         if (this._token) {
             headersObj['X-Plex-Token'] = this._token;

package/dist/src/config.d.ts

@@ -1,5 +1,8 @@
 export declare const PROJECT = "PlexAPI";
 export declare const VERSION = "3.3.0";
+/**
+ * Default timeout for requests in milliseconds.
+ */
 export declare const TIMEOUT = 30000;
 export declare const X_PLEX_CONTAINER_SIZE = 100;
 export declare const X_PLEX_ENABLE_FAST_CONNECT: false;

package/dist/src/config.js

@@ -7,7 +7,10 @@ import { getMAC, parseMAC } from '@ctrl/mac-address';
 // PlexAPI Settings
 export const PROJECT = 'PlexAPI';
 export const VERSION = '3.3.0';
-export const TIMEOUT = 30000;
+/**
+ * Default timeout for requests in milliseconds.
+ */
+export const TIMEOUT = 30_000;
 export const X_PLEX_CONTAINER_SIZE = 100;
 export const X_PLEX_ENABLE_FAST_CONNECT = false;
 // Plex Header Configuation

package/dist/src/myplex.d.ts

@@ -9,12 +9,12 @@ import { PlexServer } from './server.js';
  * and return this object.
  */
 export declare class MyPlexAccount {
-    private readonly baseUrl;
+    baseUrl: string | null;
     username?: string;
-    private readonly password?;
+    password?: string;
     token?: string;
-    private readonly timeout;
-    private readonly server?;
+    timeout: number;
+    server?: PlexServer;
     static key: string;
     FRIENDINVITE: string;
     HOMEUSERCREATE: string;
@@ -115,7 +115,7 @@ export declare class MyPlexAccount {
      * @param headers
      * @param timeout
      */
-    query<T = any>(url: string, method?: 'get' | 'post' | 'put' | 'patch' | 'head' | 'delete', headers?: any, timeout?: number, username?: string, password?: string): Promise<T>;
+    query<T = any>(url: string, method?: 'get' | 'post' | 'put' | 'patch' | 'head' | 'delete', headers?: any, username?: string, password?: string): Promise<T>;
     /**
      * Returns a str, a new "claim-token", which you can use to register your new Plex Server instance to your account.
      * @link https://hub.docker.com/r/plexinc/pms-docker/
@@ -136,7 +136,7 @@ export declare class MyPlexAccount {
  */
 export declare class MyPlexResource {
     readonly account: MyPlexAccount;
-    private readonly baseUrl;
+    private baseUrl;
     static key: string;
     TAG: string;
     /** Descriptive name of this resource */

package/dist/src/myplex.js

@@ -1,5 +1,5 @@
-import { URL, URLSearchParams } from 'url';
-import got from 'got';
+import { URLSearchParams } from 'url';
+import { ofetch } from 'ofetch';
 import pAny from 'p-any';
 import { parseStringPromise } from 'xml2js';
 import { PlexObject } from './base/plexObject.js';
@@ -64,8 +64,7 @@ export class MyPlexAccount {
      */
     async connect() {
         if (!this.token) {
-            // log('Logging in with username', { username: this.username });
-            const data = await this._signin(this.username, this.password, this.timeout);
+            const data = await this._signin(this.username, this.password);
             this._loadData(data);
             return this;
         }
@@ -118,27 +117,28 @@ export class MyPlexAccount {
      * @param headers
      * @param timeout
      */
-    async query(url, method = 'get', headers, timeout, username, password) {
+    async query(url, method = 'get', headers, username, password) {
         const requestHeaders = this._headers();
         if (username && password) {
             const credentials = Buffer.from(`${username}:${password}`).toString('base64');
             requestHeaders.Authorization = `Basic ${credentials}`;
         }
-        const promise = got({
+        if (!url.includes('xml')) {
+            requestHeaders.accept = 'application/json';
+        }
+        const body = await ofetch(url, {
             method,
-            url: new URL(url),
             headers: requestHeaders,
-            timeout: { request: timeout ?? TIMEOUT },
-            ...(username ? { username } : {}),
-            ...(password ? { password } : {}),
-            retry: { limit: 0 },
+            timeout: this.timeout ?? TIMEOUT,
+            retry: 0,
+            parseResponse: res => res,
+            // Can't seem to pass responseType
         });
         if (url.includes('xml')) {
-            const res = await promise;
-            const xml = await parseStringPromise(res.body);
+            const xml = await parseStringPromise(body);
             return xml;
         }
-        const res = await promise.json();
+        const res = JSON.parse(body);
         return res;
     }
     /**
@@ -148,7 +148,7 @@ export class MyPlexAccount {
      */
     async claimToken() {
         const url = 'https://plex.tv/api/claim/token.json';
-        const response = await this.query(url, 'get', undefined, TIMEOUT);
+        const response = await this.query(url, 'get', undefined);
         return response.token;
     }
     /**
@@ -160,12 +160,11 @@ export class MyPlexAccount {
             ...BASE_HEADERS,
         });
         const url = `${this.baseUrl}/myplex/claim?${params.toString()}`;
-        return got({
-            method: 'POST',
-            url,
-            timeout: { request: TIMEOUT },
+        return ofetch(url, {
+            method: 'post',
+            timeout: TIMEOUT,
             headers: this._headers(),
-            retry: { limit: 0 },
+            retry: 0,
         });
     }
     _headers() {
@@ -178,8 +177,8 @@ export class MyPlexAccount {
         }
         return headers;
     }
-    async _signin(username, password, timeout) {
-        const data = await this.query(this.SIGNIN, 'post', undefined, timeout, username, password);
+    async _signin(username, password) {
+        const data = await this.query(this.SIGNIN, 'post', undefined, username, password);
         return data.user;
     }
     _loadData(user) {
@@ -265,7 +264,7 @@ export class MyPlexResource {
     /** Remove this device from your account */
     async delete() {
         const key = `https://plex.tv/api/servers/${this.clientIdentifier}?X-Plex-Client-Identifier=${BASE_HEADERS['X-Plex-Client-Identifier']}&X-Plex-Token=${this.accessToken}`;
-        await got.delete(key, { retry: { limit: 0 } });
+        await ofetch(key, { method: 'delete', retry: 0 });
     }
     _loadData(data) {
         this.name = data.name;

package/dist/src/server.d.ts

@@ -15,9 +15,13 @@ import { Settings } from './settings.js';
  * can also create an PlexServer instance from :class:`~plexapi.myplex.MyPlexAccount`.
  */
 export declare class PlexServer {
-    readonly baseurl: string;
-    readonly token: string;
-    readonly timeout?: number;
+    baseurl: string;
+    token: string;
+    /**
+     * Default request timeout in milliseconds.
+     * @default 30000
+     */
+    timeout: number;
     key: string;
     /** True if server allows camera upload */
     allowCameraUpload: boolean;
@@ -131,7 +135,12 @@ export declare class PlexServer {
     _library?: Library;
     _settings?: Settings;
     private _myPlexAccount?;
-    constructor(baseurl: string, token: string, timeout?: number);
+    constructor(baseurl: string, token: string, 
+    /**
+     * Default request timeout in milliseconds.
+     * @default 30000
+     */
+    timeout?: number);
     agents(mediaType?: number | string): Promise<Agent[]>;
     connect(): Promise<void>;
     /**
@@ -162,9 +171,8 @@ export declare class PlexServer {
      * @param path
      * @param method
      * @param headers
-     * @param timeout
      */
-    query<T = any>(path: string, method?: 'get' | 'post' | 'put' | 'patch' | 'head' | 'delete', headers?: any, timeout?: number, username?: string, password?: string): Promise<T>;
+    query<T = any>(path: string, method?: 'get' | 'post' | 'put' | 'patch' | 'head' | 'delete', headers?: any, username?: string, password?: string): Promise<T>;
     /**
      * Returns a list of media items from watched history. If there are many results, they will
      * be fetched from the server in batches of X_PLEX_CONTAINER_SIZE amounts. If you're only

package/dist/src/server.js

@@ -1,5 +1,5 @@
 import { URL, URLSearchParams } from 'url';
-import got from 'got';
+import { ofetch } from 'ofetch';
 import { fetchItem, fetchItems } from './baseFunctionality.js';
 import { PlexClient } from './client.js';
 import { BASE_HEADERS, TIMEOUT, X_PLEX_CONTAINER_SIZE } from './config.js';
@@ -16,7 +16,12 @@ import { Settings } from './settings.js';
  * can also create an PlexServer instance from :class:`~plexapi.myplex.MyPlexAccount`.
  */
 export class PlexServer {
-    constructor(baseurl, token, timeout) {
+    constructor(baseurl, token, 
+    /**
+     * Default request timeout in milliseconds.
+     * @default 30000
+     */
+    timeout = TIMEOUT) {
         this.baseurl = baseurl;
         this.token = token;
         this.timeout = timeout;
@@ -30,7 +35,7 @@ export class PlexServer {
         return fetchItems(this, key, undefined, Agent, this);
     }
     async connect() {
-        const data = await this.query(this.key, undefined, undefined, this.timeout);
+        const data = await this.query(this.key);
         this._loadData(data.MediaContainer);
         // Attempt to prevent token from being logged accidentally
         if (this.token) {
@@ -93,24 +98,24 @@ export class PlexServer {
      * @param path
      * @param method
      * @param headers
-     * @param timeout
      */
-    async query(path, method = 'get', headers, timeout, username, password) {
+    async query(path, method = 'get', headers, username, password) {
         const requestHeaders = this._headers();
         if (username && password) {
             const credentials = Buffer.from(`${username}:${password}`).toString('base64');
             requestHeaders.Authorization = `Basic ${credentials}`;
         }
         const url = this.url(path);
-        const response = await got({
+        if (!url.toString().includes('xml')) {
+            requestHeaders.accept = 'application/json';
+        }
+        const response = await ofetch(url.toString(), {
             method,
-            url,
             headers: requestHeaders,
-            timeout: { request: timeout ?? TIMEOUT },
-            ...(username ? { username } : {}),
-            ...(password ? { password } : {}),
-            retry: { limit: 0 },
-        }).json();
+            timeout: this.timeout ?? TIMEOUT,
+            retry: 0,
+            responseType: 'json',
+        });
         return response;
     }
     /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ctrl/plex",
-  "version": "2.1.0",
+  "version": "3.0.0",
   "description": "plex api client in typescript",
   "author": "Scott Cooper <scttcper@gmail.com>",
   "publishConfig": {
@@ -39,15 +39,15 @@
   },
   "dependencies": {
     "@ctrl/mac-address": "^3.0.3",
-    "got": "^13.0.0",
+    "ofetch": "^1.3.4",
     "p-any": "^4.0.0",
-    "type-fest": "^4.16.0",
-    "ws": "^8.16.0",
+    "type-fest": "^4.17.0",
+    "ws": "^8.17.0",
     "xml2js": "^0.6.2"
   },
   "devDependencies": {
     "@biomejs/biome": "1.7.1",
-    "@ctrl/eslint-config-biome": "2.6.5",
+    "@ctrl/eslint-config-biome": "2.6.7",
     "@sindresorhus/tsconfig": "5.0.0",
     "@types/lodash": "4.17.0",
     "@types/micromatch": "4.0.7",
@@ -55,7 +55,7 @@
     "@types/ws": "8.5.10",
     "@types/xml2js": "0.4.14",
     "@types/yargs": "17.0.32",
-    "@vitest/coverage-v8": "1.5.0",
+    "@vitest/coverage-v8": "1.5.2",
     "delay": "6.0.0",
     "eslint": "8.57.0",
     "execa": "8.0.1",
@@ -68,7 +68,7 @@
     "ts-node": "10.9.2",
     "typedoc": "0.25.13",
     "typescript": "5.4.5",
-    "vitest": "1.5.0",
+    "vitest": "1.5.2",
     "yargs": "17.7.2"
   },
   "release": {