Added local network support and search parameters

package.json

@@ -1,6 +1,6 @@
 {
   "name": "plex-api-oauth",
-  "version": "1.1.2",
+  "version": "1.1.9",
   "description": "An NPM Module designed to make Plex Media Server and plex.tv API calls easier to implement in JavaScript and React projects",
   "main": "./src/index.js",
   "type": "module",

src/PlexAPIOAuth/PlexAPIOAuth.js

@@ -51,6 +51,10 @@ export class PlexAPIOAuth {
     };
   }
 
+  onlyUnique(value, index, self) {
+    return self.indexOf(value) === index;
+  }
+
   PlexLogout() {
     this.clientId = "";
     this.product = "Plex-API-OAuth";
@@ -232,11 +236,13 @@ export class PlexAPIOAuth {
     }
   }
 
-  async GetPlexServers() {
+  async GetPlexServers(searchParams = null) {
+    let serverArray = [];
     let response = await axios({
       method: "GET",
       url:
         "https://plex.tv/api/v2/resources?" +
+        qs.stringify(searchParams) +
         qs.stringify({
           includeHttps: 1,
           includeRelay: 1,
@@ -251,53 +257,81 @@ export class PlexAPIOAuth {
       throw err;
     });
     this.plexDevices = response.data;
-    this.plexServers = response.data
+    for (const server of response.data.filter(
-      .filter((Obj) => Obj.product === "Plex Media Server")
+      (Obj) => Obj.product === "Plex Media Server"
-      .map((Obj) => {
+    )) {
-        return {
+      let localConnection = null;
-          name: Obj.name,
+      let serverCapabilities = null;
-          product: Obj.product,
+      let preferredConnection = server.connections.filter(
-          productVersion: Obj.productVersion,
-          platform: Obj.platform,
-          platformVersion: Obj.platformVersion,
-          device: Obj.device,
-          clientIdentifier: Obj.clientIdentifier,
-          createdAt: Obj.createdAt,
-          lastSeenAt: Obj.lastSeenAt,
-          localConnections: Obj.connections.filter(
-            (connection) => connection.local === true
-          ),
-          provides: Obj.provides,
-          ownerId: Obj.ownerId,
-          sourceTitle: Obj.sourceTitle,
-          publicAddress: Obj.publicAddress,
-          accessToken: Obj.accessToken,
-          owned: Obj.owned,
-          home: Obj.home,
-          synced: Obj.synced,
-          relay: Obj.relay,
-          relayConnections: Obj.connections.filter(
         (connection) => connection.relay === true
-          ),
+      )[0];
-          presence: Obj.presence,
+      for (const connection of server.connections.filter(
-          httpsRequired: Obj.httpsRequired,
+        (entry) => entry.local === true
-          publicAddressMatches: Obj.publicAddressMatches,
+      )) {
-          dnsRebindingProtection: Obj.dnsRebindingProtection,
+        if (localConnection === null && serverCapabilities === null) {
-          natLoopbackSupported: Obj.natLoopbackSupported,
+          try {
-          connections: Obj.connections,
-        };
-      });
-    return this.plexServers;
-  }
-
-  async GetPlexLibraries(servers) {
-    let libraryArray = [];
-    servers = servers || this.plexServers;
-    for (const server of servers) {
             let response = await axios({
               method: "GET",
               url:
-          server.relayConnections[0].uri +
+                connection.uri +
+                "/?" +
+                qs.stringify({ "X-Plex-Token": server.accessToken }),
+              timeout: 1000,
+            });
+            localConnection = connection;
+            serverCapabilities = response.data.MediaContainer;
+            preferredConnection = connection;
+          } catch {}
+        }
+      }
+      serverArray.push({
+        name: server.name,
+        product: server.product,
+        productVersion: server.productVersion,
+        platform: server.platform,
+        platformVersion: server.platformVersion,
+        device: server.device,
+        clientIdentifier: server.clientIdentifier,
+        createdAt: server.createdAt,
+        lastSeenAt: server.lastSeenAt,
+        localConnection: localConnection,
+        preferredConnection: preferredConnection,
+        provides: server.provides,
+        ownerId: server.ownerId,
+        sourceTitle: server.sourceTitle,
+        publicAddress: server.publicAddress,
+        accessToken: server.accessToken,
+        owned: server.owned,
+        home: server.home,
+        synced: server.synced,
+        relay: server.relay,
+        relayConnection: server.connections.filter(
+          (connection) => connection.relay === true
+        )[0],
+        serverCapabilities: serverCapabilities,
+        presence: server.presence,
+        httpsRequired: server.httpsRequired,
+        publicAddressMatches: server.publicAddressMatches,
+        dnsRebindingProtection: server.dnsRebindingProtection,
+        natLoopbackSupported: server.natLoopbackSupported,
+        connections: server.connections,
+      });
+    }
+    this.plexServers = serverArray;
+    return serverArray;
+  }
+
+  async GetPlexLibraries(servers = this.plexServers) {
+    let libraryArray = [];
+    for (const server of servers) {
+      let connectionUri = server.relayConnection;
+      if (server.localConnection) {
+        connectionUri = server.localConnection;
+      }
+      let response = await axios({
+        method: "GET",
+        url:
+          connectionUri.uri +
           "/library/sections/?" +
           qs.stringify({
             "X-Plex-Token": server.accessToken,
@@ -337,14 +371,17 @@ export class PlexAPIOAuth {
     return this.plexLibraries;
   }
 
-  async GetPlexMovieLibraries(servers) {
+  async GetPlexMovieLibraries(servers = this.plexServers) {
     let libraryArray = [];
-    servers = servers || this.plexServers;
     for (const server of servers) {
+      let connectionUri = server.relayConnection;
+      if (server.localConnection) {
+        connectionUri = server.localConnection;
+      }
       let response = await axios({
         method: "GET",
         url:
-          server.relayConnections[0].uri +
+          connectionUri.uri +
           "/library/sections/?" +
           qs.stringify({
             "X-Plex-Token": server.accessToken,
@@ -385,14 +422,17 @@ export class PlexAPIOAuth {
     return libraryArray;
   }
 
-  async GetPlexMusicLibraries(servers) {
+  async GetPlexMusicLibraries(servers = this.plexServers) {
     let libraryArray = [];
-    servers = servers || this.plexServers;
     for (const server of servers) {
+      let connectionUri = server.relayConnection;
+      if (server.localConnection) {
+        connectionUri = server.localConnection;
+      }
       let response = await axios({
         method: "GET",
         url:
-          server.relayConnections[0].uri +
+          connectionUri.uri +
           "/library/sections/?" +
           qs.stringify({
             "X-Plex-Token": server.accessToken,
@@ -433,14 +473,17 @@ export class PlexAPIOAuth {
     return libraryArray;
   }
 
-  async GetPlexTVShowLibraries(servers) {
+  async GetPlexTVShowLibraries(servers = this.plexServers) {
     let libraryArray = [];
-    servers = servers || this.plexServers;
     for (const server of servers) {
+      let connectionUri = server.relayConnection;
+      if (server.localConnection) {
+        connectionUri = server.localConnection;
+      }
       let response = await axios({
         method: "GET",
         url:
-          server.relayConnections[0].uri +
+          connectionUri.uri +
           "/library/sections/?" +
           qs.stringify({
             "X-Plex-Token": server.accessToken,
@@ -481,12 +524,18 @@ export class PlexAPIOAuth {
     return libraryArray;
   }
 
-  async GetPlexMovies(servers, libraries, searchString) {
+  async GetPlexMovies(
+    servers = this.plexServers,
+    libraries = this.plexLibraries,
+    searchParams = null
+  ) {
     let movieLibraryContent = [];
-    servers = servers || this.plexServers;
+    for (const server of servers) {
-    libraries = libraries || this.plexLibraries;
+      let connectionUri = server.relayConnection;
-    for (const server of this.plexServers) {
+      if (server.localConnection) {
-      for (const library of this.plexLibraries.filter(
+        connectionUri = server.localConnection;
+      }
+      for (const library of libraries.filter(
         (Obj) =>
           Obj.server.clientIdentifier === server.clientIdentifier &&
           Obj.type === "movie"
@@ -494,13 +543,13 @@ export class PlexAPIOAuth {
         let response = await axios({
           method: "GET",
           url:
-            server?.relayConnections[0].uri +
+            connectionUri.uri +
             "/library/sections/" +
             library?.key +
             "/all?" +
+            qs.stringify(searchParams) +
             qs.stringify({
               type: 1,
-              title: searchString,
               "X-Plex-Token": server?.accessToken,
             }),
           headers: { accept: "application/json" },
@@ -542,16 +591,21 @@ export class PlexAPIOAuth {
         }
       }
     }
-    this.plexMovieLibraryContent = movieLibraryContent;
     return movieLibraryContent;
   }
 
-  async GetPlexMusicLibraryContent() {
+  async GetPlexArtists(
+    servers = this.plexServers,
+    libraries = this.plexLibraries,
+    searchParams = null
+  ) {
     let artistLibraryContent = [];
-    let albumLibraryContent = [];
+    for (const server of servers) {
-    let songLibraryContent = [];
+      let connectionUri = server.relayConnection;
-    for (const server of this.plexServers) {
+      if (server.localConnection) {
-      for (const library of this.plexLibraries.filter(
+        connectionUri = server.localConnection;
+      }
+      for (const library of libraries.filter(
         (Obj) =>
           Obj.server.clientIdentifier === server.clientIdentifier &&
           Obj.type === "artist"
@@ -559,12 +613,13 @@ export class PlexAPIOAuth {
         let response = await axios({
           method: "GET",
           url:
-            server?.relayConnections[0].uri +
+            connectionUri.uri +
             "/library/sections/" +
             library?.key +
             "/all?" +
+            qs.stringify(searchParams) +
             qs.stringify({
-              "X-Plex-Token": server?.accessToken,
+              "X-Plex-Token": server.accessToken,
             }),
           headers: { accept: "application/json" },
         }).catch((err) => {
@@ -590,16 +645,35 @@ export class PlexAPIOAuth {
           });
         }
       }
-      for (const musicLibrary of this.plexMusicLibraries.filter(
+    }
-        (Obj) => Obj.server.clientIdentifier === server.clientIdentifier
+
+    return artistLibraryContent;
+  }
+
+  async GetPlexAlbums(
+    servers = this.plexServers,
+    libraries = this.plexLibraries,
+    searchParams = null
+  ) {
+    let albumLibraryContent = [];
+    for (const server of servers) {
+      let connectionUri = server.relayConnection;
+      if (server.localConnection) {
+        connectionUri = server.localConnection;
+      }
+      for (const library of libraries.filter(
+        (Obj) =>
+          Obj.server.clientIdentifier === server.clientIdentifier &&
+          Obj.type === "artist"
       )) {
         let response = await axios({
           method: "GET",
           url:
-            server?.relayConnections[0].uri +
+            connectionUri.uri +
             "/library/sections/" +
-            musicLibrary?.key +
+            library?.key +
             "/all?" +
+            qs.stringify(searchParams) +
             qs.stringify({
               type: 9,
               "X-Plex-Token": server?.accessToken,
@@ -609,16 +683,59 @@ export class PlexAPIOAuth {
           throw err;
         });
         for (const data of response.data.MediaContainer.Metadata) {
-          let tempObject = data;
+          albumLibraryContent.push({
-          albumLibraryContent.push(tempObject);
+            server: server,
+            library: library,
+            addedAt: data.addedAt,
+            guid: data.guid,
+            index: data.index,
+            key: data.key,
+            loudnessAnalysisVersion: data.loudnessAnalysisVersion,
+            musicAnalysisVersion: data.musicAnalysisVersion,
+            originallyAvailableAt: data.originallyAvailableAt,
+            parentGuid: data.parentGuid,
+            parentKey: data.parentKey,
+            parentRatingKey: data.parentRatingKey,
+            parentThumb: data.parentThumb,
+            parentTitle: data.parentTitle,
+            ratingKey: data.ratingKey,
+            summary: data.summary,
+            thumb: data.thumb,
+            title: data.title,
+            type: data.type,
+            updatedAt: data.updatedAt,
+            year: data.year,
+          });
         }
-        response = await axios({
+      }
+    }
+    return albumLibraryContent;
+  }
+
+  async GetPlexSongs(
+    servers = this.plexServers,
+    libraries = this.plexLibraries,
+    searchParams = null
+  ) {
+    let songLibraryContent = [];
+    for (const server of servers) {
+      let connectionUri = server.relayConnection;
+      if (server.localConnection) {
+        connectionUri = server.localConnection;
+      }
+      for (const library of libraries.filter(
+        (Obj) =>
+          Obj.server.clientIdentifier === server.clientIdentifier &&
+          Obj.type === "artist"
+      )) {
+        let response = await axios({
           method: "GET",
           url:
-            server?.relayConnections[0].uri +
+            connectionUri.uri +
             "/library/sections/" +
-            musicLibrary?.key +
+            library?.key +
             "/all?" +
+            qs.stringify(searchParams) +
             qs.stringify({
               type: 10,
               "X-Plex-Token": server?.accessToken,
@@ -628,9 +745,9 @@ export class PlexAPIOAuth {
           throw err;
         });
         for (const data of response.data.MediaContainer.Metadata) {
-          let tempObject = {
+          songLibraryContent.push({
             server: server,
-            library: musicLibrary,
+            library: library,
             ratingKey: data.ratingKey,
             key: data.key,
             parentRatingKey: data.parentRatingKey,
@@ -656,32 +773,37 @@ export class PlexAPIOAuth {
             updatedAt: data.updatedAt,
             musicAnalysisVersion: data.musicAnalysisVersion,
             Media: data.Media,
-          };
+          });
-          songLibraryContent.push(tempObject);
         }
       }
     }
-    this.plexArtistLibraries = artistLibraryContent;
+    return songLibraryContent;
-    this.plexAlbumLibraries = albumLibraryContent;
-    this.plexSongLibraries = songLibraryContent;
-    return artistLibraryContent;
   }
 
-  async GetPlexTVShowLibraryContent() {
+  async GetPlexShows(
+    servers = this.plexServers,
+    libraries = this.plexLibraries,
+    searchParams = null
+  ) {
     let tvShowLibraryContent = [];
-    let seasonLibraryContent = [];
+    for (const server of servers) {
-    let episodeLibraryContent = [];
+      let connectionUri = server.relayConnection;
-    for (const server of this.plexServers) {
+      if (server.localConnection) {
-      for (const showLibrary of this.plexTVShowLibraries.filter(
+        connectionUri = server.localConnection;
-        (Obj) => Obj.server.clientIdentifier === server.clientIdentifier
+      }
+      for (const showLibrary of libraries.filter(
+        (Obj) =>
+          Obj.server.clientIdentifier === server.clientIdentifier &&
+          Obj.type === "show"
       )) {
         let response = await axios({
           method: "GET",
           url:
-            server?.relayConnections[0].uri +
+            connectionUri.uri +
             "/library/sections/" +
             showLibrary?.key +
             "/all?" +
+            qs.stringify(searchParams) +
             qs.stringify({
               type: 2,
               "X-Plex-Token": server?.accessToken,
@@ -726,14 +848,35 @@ export class PlexAPIOAuth {
             Role: data.Role,
           });
         }
+      }
+    }
+    return tvShowLibraryContent;
+  }
 
-        response = await axios({
+  async GetPlexSeasons(
+    servers = this.plexServers,
+    libraries = this.plexLibraries,
+    searchParams = null
+  ) {
+    let seasonArray = [];
+    for (const server of servers) {
+      let connectionUri = server.relayConnection;
+      if (server.localConnection) {
+        connectionUri = server.localConnection;
+      }
+      for (const showLibrary of libraries.filter(
+        (Obj) =>
+          Obj.server.clientIdentifier === server.clientIdentifier &&
+          Obj.type === "show"
+      )) {
+        let response = await axios({
           method: "GET",
           url:
-            server?.relayConnections[0].uri +
+            connectionUri.uri +
             "/library/sections/" +
             showLibrary?.key +
             "/all?" +
+            qs.stringify(searchParams) +
             qs.stringify({
               type: 3,
               "X-Plex-Token": server?.accessToken,
@@ -742,18 +885,38 @@ export class PlexAPIOAuth {
         }).catch((err) => {
           throw err;
         });
-        for (const data of response.data.MediaContainer.Metadata) {
+        for (const season of response.data.MediaContainer.Metadata) {
-          let tempObject = data;
+          seasonArray.push(season);
-          seasonLibraryContent.push(tempObject);
+        }
+      }
+    }
+    return seasonArray;
   }
 
-        response = await axios({
+  async GetPlexEpisodes(
+    servers = this.plexServers,
+    libraries = this.plexLibraries,
+    searchParams = null
+  ) {
+    let episodeLibrary = [];
+    for (const server of servers) {
+      let connectionUri = server.relayConnection;
+      if (server.localConnection) {
+        connectionUri = server.localConnection;
+      }
+      for (const showLibrary of libraries.filter(
+        (Obj) =>
+          Obj.server.clientIdentifier === server.clientIdentifier &&
+          Obj.type === "show"
+      )) {
+        let response = await axios({
           method: "GET",
           url:
-            server?.relayConnections[0].uri +
+            connectionUri.uri +
             "/library/sections/" +
             showLibrary?.key +
             "/all?" +
+            qs.stringify(searchParams) +
             qs.stringify({
               type: 4,
               "X-Plex-Token": server?.accessToken,
@@ -762,46 +925,11 @@ export class PlexAPIOAuth {
         }).catch((err) => {
           throw err;
         });
-        for (const data of response.data.MediaContainer.Metadata) {
+        for (const episode of response.data.MediaContainer.Metadata) {
-          let tempObject = data;
+          episodeLibrary.push(episode);
-          episodeLibraryContent.push(tempObject);
         }
       }
     }
-    this.plexTVShowLibraryContent = tvShowLibraryContent;
+    return episodeLibrary;
-    this.plexSeasonLibraries = seasonLibraryContent;
-    this.episodeLibraryContent = episodeLibraryContent;
-    return tvShowLibraryContent;
-  }
-
-  async GetPlexTVShowSeasons(servers, libraries, searchString) {
-    let responseArray = [];
-    servers = servers || this.plexServers;
-    libraries = libraries || this.plexLibraries;
-    searchString = searchString || "";
-    for (const server of servers) {
-      for (const showLibrary of libraries.filter(
-        (Obj) => Obj.server.clientIdentifier === server.clientIdentifier
-      )) {
-        let response = await axios({
-          method: "GET",
-          url:
-            server?.relayConnections[0].uri +
-            "/library/sections/" +
-            showLibrary?.key +
-            "/all?" +
-            qs.stringify({
-              title: searchString,
-              type: 3,
-              "X-Plex-Token": server?.accessToken,
-            }),
-          headers: { accept: "application/json" },
-        }).catch((err) => {
-          throw err;
-        });
-        responseArray.push(...response.data.MediaContainer.Metadata);
-      }
-    }
-    return responseArray;
   }
 }

test/index.test.js

@@ -28,8 +28,8 @@ describe("Unit Tests", function () {
     // console.log(PlexSession.plexTVUserData);
   });
   it("Get Plex Servers", async function () {
-    this.timeout(10000);
+    this.timeout(12000);
-    let response = await PlexSession.GetPlexServers();
+    let response = await PlexSession.GetPlexServers({ owned: true });
     assert.notEqual(PlexSession.plexServers, emptyArray);
     assert.notEqual(PlexSession.plexServers, null);
     assert.notEqual(PlexSession.plexServers, undefined);
@@ -39,8 +39,8 @@ describe("Unit Tests", function () {
     assert.notEqual(response, emptyArray);
     assert.notEqual(response, null);
     assert.notEqual(response, undefined);
-    // console.log("Plex Servers");
+    //console.log("Plex Servers");
-    // console.log(PlexSession.plexServers);
+    //console.log(PlexSession.plexServers);
   });
   it("Get Plex Libraries", async function () {
     this.timeout(10000);
@@ -51,40 +51,97 @@ describe("Unit Tests", function () {
     assert.notEqual(response, emptyArray);
     assert.notEqual(response, null);
     assert.notEqual(response, undefined);
-    // console.log("Plex Libraries");
+    //console.log("Plex Libraries");
-    // console.log(PlexSession.plexLibraries);
+    //console.log(PlexSession.plexLibraries);
   });
-  it("Get Plex Movies Libraries", async function () {
+  it("Get Plex Movie Libraries", async function () {
-    this.timeout(10000);
+    this.timeout(20000);
     let response = await PlexSession.GetPlexMovieLibraries();
-    assert.notEqual(PlexSession.plexMovieLibraries, null);
-    assert.notEqual(PlexSession.plexMovieLibraries, undefined);
-    assert.notEqual(PlexSession.plexMovieLibraries, emptyArray);
     assert.notEqual(response, emptyArray);
     assert.notEqual(response, null);
     assert.notEqual(response, undefined);
-    // console.log("Plex Libraries");
+    // console.log("Plex Movie Libraries");
-    // console.log(PlexSession.plexLibraries);
+    // console.log(response);
   });
   it("Get Plex Music Libraries", async function () {
     this.timeout(10000);
     let response = await PlexSession.GetPlexMusicLibraries();
-    assert.notEqual(PlexSession.plexMusicLibraries, null);
-    assert.notEqual(PlexSession.plexMusicLibraries, undefined);
-    assert.notEqual(PlexSession.plexMusicLibraries, emptyArray);
     assert.notEqual(response, emptyArray);
     assert.notEqual(response, null);
     assert.notEqual(response, undefined);
-    // console.log("Plex Libraries");
+    // console.log("Plex Music Libraries");
-    // console.log(PlexSession.plexLibraries);
+    // console.log(response);
   });
   it("Get Plex TV Libraries", async function () {
     this.timeout(10000);
     let response = await PlexSession.GetPlexTVShowLibraries();
-    assert.notEqual(PlexSession.plexTVShowLibraries, null);
+    assert.notEqual(response, emptyArray);
-    assert.notEqual(PlexSession.plexTVShowLibraries, undefined);
+    assert.notEqual(response, null);
-    assert.notEqual(PlexSession.plexTVShowLibraries, emptyArray);
+    assert.notEqual(response, undefined);
-    // console.log("Plex Libraries");
+    // console.log("Plex TV Libraries");
-    // console.log(PlexSession.plexLibraries);
+    // console.log(response);
+  });
+  it("Get Plex Movies", async function () {
+    this.timeout(10000);
+    let response = await PlexSession.GetPlexMovies();
+    assert.notEqual(response, emptyArray);
+    assert.notEqual(response, null);
+    assert.notEqual(response, undefined);
+    // console.log("Plex Movies");
+    // console.log(response);
+  });
+  it("Get Plex Shows", async function () {
+    this.timeout(10000);
+    let response = await PlexSession.GetPlexShows();
+    assert.notEqual(response, emptyArray);
+    assert.notEqual(response, null);
+    assert.notEqual(response, undefined);
+    // console.log("Plex Shows");
+    // console.log(response);
+  });
+  it("Get Plex Seasons", async function () {
+    this.timeout(10000);
+    let response = await PlexSession.GetPlexSeasons();
+    assert.notEqual(response, emptyArray);
+    assert.notEqual(response, null);
+    assert.notEqual(response, undefined);
+    // console.log("Plex Seasons");
+    // console.log(response);
+  });
+  it("Get Plex Episodes", async function () {
+    this.timeout(20000);
+    let response = await PlexSession.GetPlexEpisodes();
+    assert.notEqual(response, emptyArray);
+    assert.notEqual(response, null);
+    assert.notEqual(response, undefined);
+    // console.log("Plex Episodes");
+    // console.log(response);
+  });
+  it("Get Plex Artists", async function () {
+    this.timeout(10000);
+    let response = await PlexSession.GetPlexArtists();
+    assert.notEqual(response, emptyArray);
+    assert.notEqual(response, null);
+    assert.notEqual(response, undefined);
+    // console.log("Plex Artists");
+    // console.log(response);
+  });
+  it("Get Plex Albums", async function () {
+    this.timeout(10000);
+    let response = await PlexSession.GetPlexAlbums();
+    assert.notEqual(response, emptyArray);
+    assert.notEqual(response, null);
+    assert.notEqual(response, undefined);
+    // console.log("Plex Albums");
+    // console.log(response);
+  });
+  it("Get Plex Songs", async function () {
+    this.timeout(20000);
+    let response = await PlexSession.GetPlexSongs();
+    assert.notEqual(response, emptyArray);
+    assert.notEqual(response, null);
+    assert.notEqual(response, undefined);
+    //console.log("Plex Songs");
+    //console.log(response);
   });
 });