diff --git a/package-lock.json b/package-lock.json index 215c478..f10f2da 100644 --- a/package-lock.json +++ b/package-lock.json @@ -481,17 +481,6 @@ "url": "https://github.com/chalk/chalk?sponsor=1" } }, - "node_modules/chalk/node_modules/supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dependencies": { - "has-flag": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, "node_modules/chokidar": { "version": "3.5.3", "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz", @@ -1346,6 +1335,20 @@ "url": "https://opencollective.com/mochajs" } }, + "node_modules/mocha/node_modules/supports-color": { + "version": "8.1.1", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", + "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==", + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/supports-color?sponsor=1" + } + }, "node_modules/ms": { "version": "2.1.3", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", @@ -1789,17 +1792,14 @@ } }, "node_modules/supports-color": { - "version": "8.1.1", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", - "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==", + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", "dependencies": { "has-flag": "^4.0.0" }, "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/supports-color?sponsor=1" + "node": ">=8" } }, "node_modules/to-regex-range": { @@ -2415,16 +2415,6 @@ "requires": { "ansi-styles": "^4.1.0", "supports-color": "^7.1.0" - }, - "dependencies": { - "supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "requires": { - "has-flag": "^4.0.0" - } - } } }, "chokidar": { @@ -3056,6 +3046,16 @@ "yargs": "16.2.0", "yargs-parser": "20.2.4", "yargs-unparser": "2.0.0" + }, + "dependencies": { + "supports-color": { + "version": "8.1.1", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", + "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==", + "requires": { + "has-flag": "^4.0.0" + } + } } }, "ms": { @@ -3380,9 +3380,9 @@ "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==" }, "supports-color": { - "version": "8.1.1", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", - "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==", + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", "requires": { "has-flag": "^4.0.0" } diff --git a/package.json b/package.json index c422a43..b3573d3 100644 --- a/package.json +++ b/package.json @@ -1,8 +1,8 @@ { "name": "plex-api-oauth", - "version": "1.0.128", + "version": "1.0.134", "description": "An NPM Module designed to make Plex Media Server and plex.tv API calls easier to implement in JavaScript and React projects", - "main": "index.mts", + "main": "./src/index.js", "type": "module", "scripts": { "test": "mocha ./test/index.test.js" diff --git a/src/PlexAPIOAuth/PlexAPIOAuth.js b/src/PlexAPIOAuth/PlexAPIOAuth.js index 31d0b08..c842530 100644 --- a/src/PlexAPIOAuth/PlexAPIOAuth.js +++ b/src/PlexAPIOAuth/PlexAPIOAuth.js @@ -26,8 +26,8 @@ export class PlexAPIOAuth { plexTVAuthToken = "", plexTVUserData = {}, plexServers = [], - plexDevices = [], - selectedPlexServer = {} + plexLibraries = [], + plexDevices = [] ) { this.clientId = clientId; this.product = product; @@ -39,8 +39,8 @@ export class PlexAPIOAuth { this.plexTVAuthToken = plexTVAuthToken; this.plexTVUserData = plexTVUserData; this.plexServers = plexServers; + this.plexLibraries = plexLibraries; this.plexDevices = plexDevices; - this.selectedPlexServer = selectedPlexServer; this.plexClientInformation = { clientIdentifier: this.clientId, // This is a unique identifier used to identify your app with Plex. - If none is provided a new one is generated and saved locally @@ -52,6 +52,28 @@ export class PlexAPIOAuth { }; } + PlexLogout() { + this.clientId = ""; + this.product = "Plex-API-OAuth"; + this.device = "Web-Client"; + this.version = "1"; + this.forwardUrl = ""; + this.platform = "Web"; + this.plexTVAuthToken = ""; + this.plexTVUserData = {}; + this.plexServers = []; + this.plexLibraries = []; + this.plexDevices = []; + this.plexClientInformation = { + clientIdentifier: this.clientId, // This is a unique identifier used to identify your app with Plex. - If none is provided a new one is generated and saved locally + product: this.product, // Name of your application - Defaults to Plex-API-OAuth + device: this.device, // The type of device your application is running on - Defaults to "Web Client" + version: this.version, // Version of your application - Defaults to 1 + forwardUrl: this.forwardUrl, // Url to forward back to after signing in - Defaults to an empty string + platform: this.platform, // Platform your application runs on - Defaults to 'Web' + }; + } + SetPlexSession({ clientId = "", product = "Plex-API-OAuth", @@ -62,8 +84,8 @@ export class PlexAPIOAuth { plexTVAuthToken = "", plexTVUserData = {}, plexServers = [], + plexLibraries = [], plexDevices = [], - selectedPlexServer = {}, }) { this.plexTVAuthToken = plexTVAuthToken; this.plexTVUserData = plexTVUserData; @@ -74,8 +96,8 @@ export class PlexAPIOAuth { this.forwardUrl = forwardUrl; this.platform = platform; this.plexServers = plexServers; + this.plexLibraries = plexLibraries; this.plexDevices = plexDevices; - this.selectedPlexServer = selectedPlexServer; this.plexClientInformation = { clientIdentifier: this.clientId, // This is a unique identifier used to identify your app with Plex. - If none is provided a new one is generated and saved locally @@ -99,8 +121,8 @@ export class PlexAPIOAuth { forwardUrl: this.forwardUrl, platform: this.platform, plexServers: this.plexServers, + plexLibraries: this.plexLibraries, plexDevices: this.plexDevices, - selectedPlexServer: this.selectedPlexServer, plexClientInformation: this.plexClientInformation, }; console.log(sessionData); @@ -239,21 +261,21 @@ export class PlexAPIOAuth { return { name: Obj.name, product: Obj.product, - productVersion: Obj.product, + productVersion: Obj.productVersion, platform: Obj.platform, - platformVersion: Obj.platform, + platformVersion: Obj.platformVersion, device: Obj.device, - clientIdentifier: Obj.client, - createdAt: Obj.created, - lastSeenAt: Obj.last, + clientIdentifier: Obj.clientIdentifier, + createdAt: Obj.createdAt, + lastSeenAt: Obj.lastSeenAt, localConnections: Obj.connections.filter( (connection) => connection.local === true ), provides: Obj.provides, - ownerId: Obj.owner, - sourceTitle: Obj.source, - publicAddress: Obj.public, - accessToken: Obj.access, + ownerId: Obj.ownerId, + sourceTitle: Obj.sourceTitle, + publicAddress: Obj.publicAddress, + accessToken: Obj.accessToken, owned: Obj.owned, home: Obj.home, synced: Obj.synced, @@ -262,34 +284,71 @@ export class PlexAPIOAuth { (connection) => connection.relay === true ), presence: Obj.presence, - httpsRequired: Obj.https, - publicAddressMatches: Obj.public, - dnsRebindingProtection: Obj.dns, + httpsRequired: Obj.httpsRequired, + publicAddressMatches: Obj.publicAddressMatches, + dnsRebindingProtection: Obj.dnsRebindingProtection, natLoopbackSupported: Obj.natLoopbackSupported, connections: Obj.connections, }; }); - return response.data; + return this.plexServers; } - async GetPlexLibraries() { - let libraryArray = [] - this.plexServers.forEach((server) => { + GetPlexLibraries() { + let libraryArray = null; + this.plexServers.forEach(async (server) => { let response = await axios({ - method: "GET", - url: - server.relayConnections[0].uri + - "/library/sections/?" + - qs.stringify({ - "X-Plex-Token": server.accessToken, - }), - headers: { accept: "application/json" }, - }).catch((err) => { - throw err; + method: "GET", + url: + server.relayConnections[0].uri + + "/library/sections/?" + + qs.stringify({ + "X-Plex-Token": server.accessToken, + }), + headers: { accept: "application/json" }, + }).catch((err) => { + throw err; + }); + if (libraryArray == null) { + libraryArray = [...response?.data?.MediaContainer?.Directory]; + } else { + libraryArray = [ + ...libraryArray, + ...response?.data?.MediaContainer?.Directory, + ]; + } + this.plexLibraries = libraryArray; + // return await response?.data?.MediaContainer?.Directory.map((entry) => { + // return { + // server: server.clientIdentifier, + // allowSync: entry.allowSync, + // art: entry.art, + // composite: entry.composite, + // filters: entry.filters, + // refreshing: entry.refreshing, + // thumb: entry.thumb, + // key: entry.key, + // type: entry.type, + // title: entry.title, + // agent: entry.agent, + // scanner: entry.scanner, + // language: entry.language, + // uuid: entry.uuid, + // updatedAt: entry.updatedAt, + // createdAt: entry.createdAt, + // scannedAt: entry.scannedAt, + // content: entry.content, + // directory: entry.directory, + // contentChangedAt: entry.contentChangedAt, + // hidden: entry.hidden, + // Location: entry.Location, + // }; + // }); }); - libraryArray = [...libraryArray, ...response?.data?.MediaContainer?.Directory] - }) - this.plexLibraries = libraryArray + // Promise.all(response).then((results) => { + // this.plexLibraries = results; + // }); + return this.plexLibraries; } // async PopulateLibraryContent(server: PlexServer, library: PlexLibrary) { diff --git a/test/index.test.js b/test/index.test.js index 641fb49..5cfb186 100644 --- a/test/index.test.js +++ b/test/index.test.js @@ -38,4 +38,14 @@ describe("Login Test", function () { console.log("Plex Servers"); console.log(PlexSession.plexServers); }); + it("Get Plex Libraries", async function () { + //this.timeout(10000); + let response = await PlexSession.GetPlexLibraries(); + assert.notEqual(PlexSession.plexLibraries, null); + assert.notEqual(PlexSession.plexLibraries, undefined); + assert.notEqual(PlexSession.plexLibraries, emptyArray); + assert.notEqual(await response, null); + console.log("Plex Libraries"); + console.log(PlexSession.plexLibraries); + }); }); diff --git a/tsconfig.json b/tsconfig.json deleted file mode 100644 index 75dcaea..0000000 --- a/tsconfig.json +++ /dev/null @@ -1,103 +0,0 @@ -{ - "compilerOptions": { - /* Visit https://aka.ms/tsconfig to read more about this file */ - - /* Projects */ - // "incremental": true, /* Save .tsbuildinfo files to allow for incremental compilation of projects. */ - // "composite": true, /* Enable constraints that allow a TypeScript project to be used with project references. */ - // "tsBuildInfoFile": "./.tsbuildinfo", /* Specify the path to .tsbuildinfo incremental compilation file. */ - // "disableSourceOfProjectReferenceRedirect": true, /* Disable preferring source files instead of declaration files when referencing composite projects. */ - // "disableSolutionSearching": true, /* Opt a project out of multi-project reference checking when editing. */ - // "disableReferencedProjectLoad": true, /* Reduce the number of projects loaded automatically by TypeScript. */ - - /* Language and Environment */ - "target": "es2016", /* Set the JavaScript language version for emitted JavaScript and include compatible library declarations. */ - // "lib": [], /* Specify a set of bundled library declaration files that describe the target runtime environment. */ - // "jsx": "preserve", /* Specify what JSX code is generated. */ - // "experimentalDecorators": true, /* Enable experimental support for TC39 stage 2 draft decorators. */ - // "emitDecoratorMetadata": true, /* Emit design-type metadata for decorated declarations in source files. */ - // "jsxFactory": "", /* Specify the JSX factory function used when targeting React JSX emit, e.g. 'React.createElement' or 'h'. */ - // "jsxFragmentFactory": "", /* Specify the JSX Fragment reference used for fragments when targeting React JSX emit e.g. 'React.Fragment' or 'Fragment'. */ - // "jsxImportSource": "", /* Specify module specifier used to import the JSX factory functions when using 'jsx: react-jsx*'. */ - // "reactNamespace": "", /* Specify the object invoked for 'createElement'. This only applies when targeting 'react' JSX emit. */ - // "noLib": true, /* Disable including any library files, including the default lib.d.ts. */ - // "useDefineForClassFields": true, /* Emit ECMAScript-standard-compliant class fields. */ - // "moduleDetection": "auto", /* Control what method is used to detect module-format JS files. */ - - /* Modules */ - "module": "commonjs", /* Specify what module code is generated. */ - // "rootDir": "./", /* Specify the root folder within your source files. */ - // "moduleResolution": "node", /* Specify how TypeScript looks up a file from a given module specifier. */ - // "baseUrl": "./", /* Specify the base directory to resolve non-relative module names. */ - // "paths": {}, /* Specify a set of entries that re-map imports to additional lookup locations. */ - // "rootDirs": [], /* Allow multiple folders to be treated as one when resolving modules. */ - // "typeRoots": [], /* Specify multiple folders that act like './node_modules/@types'. */ - // "types": [], /* Specify type package names to be included without being referenced in a source file. */ - // "allowUmdGlobalAccess": true, /* Allow accessing UMD globals from modules. */ - // "moduleSuffixes": [], /* List of file name suffixes to search when resolving a module. */ - // "resolveJsonModule": true, /* Enable importing .json files. */ - // "noResolve": true, /* Disallow 'import's, 'require's or ''s from expanding the number of files TypeScript should add to a project. */ - - /* JavaScript Support */ - // "allowJs": true, /* Allow JavaScript files to be a part of your program. Use the 'checkJS' option to get errors from these files. */ - // "checkJs": true, /* Enable error reporting in type-checked JavaScript files. */ - // "maxNodeModuleJsDepth": 1, /* Specify the maximum folder depth used for checking JavaScript files from 'node_modules'. Only applicable with 'allowJs'. */ - - /* Emit */ - // "declaration": true, /* Generate .d.ts files from TypeScript and JavaScript files in your project. */ - // "declarationMap": true, /* Create sourcemaps for d.ts files. */ - // "emitDeclarationOnly": true, /* Only output d.ts files and not JavaScript files. */ - // "sourceMap": true, /* Create source map files for emitted JavaScript files. */ - // "outFile": "./", /* Specify a file that bundles all outputs into one JavaScript file. If 'declaration' is true, also designates a file that bundles all .d.ts output. */ - // "outDir": "./", /* Specify an output folder for all emitted files. */ - // "removeComments": true, /* Disable emitting comments. */ - // "noEmit": true, /* Disable emitting files from a compilation. */ - // "importHelpers": true, /* Allow importing helper functions from tslib once per project, instead of including them per-file. */ - // "importsNotUsedAsValues": "remove", /* Specify emit/checking behavior for imports that are only used for types. */ - // "downlevelIteration": true, /* Emit more compliant, but verbose and less performant JavaScript for iteration. */ - // "sourceRoot": "", /* Specify the root path for debuggers to find the reference source code. */ - // "mapRoot": "", /* Specify the location where debugger should locate map files instead of generated locations. */ - // "inlineSourceMap": true, /* Include sourcemap files inside the emitted JavaScript. */ - // "inlineSources": true, /* Include source code in the sourcemaps inside the emitted JavaScript. */ - // "emitBOM": true, /* Emit a UTF-8 Byte Order Mark (BOM) in the beginning of output files. */ - // "newLine": "crlf", /* Set the newline character for emitting files. */ - // "stripInternal": true, /* Disable emitting declarations that have '@internal' in their JSDoc comments. */ - // "noEmitHelpers": true, /* Disable generating custom helper functions like '__extends' in compiled output. */ - // "noEmitOnError": true, /* Disable emitting files if any type checking errors are reported. */ - // "preserveConstEnums": true, /* Disable erasing 'const enum' declarations in generated code. */ - // "declarationDir": "./", /* Specify the output directory for generated declaration files. */ - // "preserveValueImports": true, /* Preserve unused imported values in the JavaScript output that would otherwise be removed. */ - - /* Interop Constraints */ - // "isolatedModules": true, /* Ensure that each file can be safely transpiled without relying on other imports. */ - // "allowSyntheticDefaultImports": true, /* Allow 'import x from y' when a module doesn't have a default export. */ - "esModuleInterop": true, /* Emit additional JavaScript to ease support for importing CommonJS modules. This enables 'allowSyntheticDefaultImports' for type compatibility. */ - // "preserveSymlinks": true, /* Disable resolving symlinks to their realpath. This correlates to the same flag in node. */ - "forceConsistentCasingInFileNames": true, /* Ensure that casing is correct in imports. */ - - /* Type Checking */ - "strict": true, /* Enable all strict type-checking options. */ - // "noImplicitAny": true, /* Enable error reporting for expressions and declarations with an implied 'any' type. */ - // "strictNullChecks": true, /* When type checking, take into account 'null' and 'undefined'. */ - // "strictFunctionTypes": true, /* When assigning functions, check to ensure parameters and the return values are subtype-compatible. */ - // "strictBindCallApply": true, /* Check that the arguments for 'bind', 'call', and 'apply' methods match the original function. */ - // "strictPropertyInitialization": true, /* Check for class properties that are declared but not set in the constructor. */ - // "noImplicitThis": true, /* Enable error reporting when 'this' is given the type 'any'. */ - // "useUnknownInCatchVariables": true, /* Default catch clause variables as 'unknown' instead of 'any'. */ - // "alwaysStrict": true, /* Ensure 'use strict' is always emitted. */ - // "noUnusedLocals": true, /* Enable error reporting when local variables aren't read. */ - // "noUnusedParameters": true, /* Raise an error when a function parameter isn't read. */ - // "exactOptionalPropertyTypes": true, /* Interpret optional property types as written, rather than adding 'undefined'. */ - // "noImplicitReturns": true, /* Enable error reporting for codepaths that do not explicitly return in a function. */ - // "noFallthroughCasesInSwitch": true, /* Enable error reporting for fallthrough cases in switch statements. */ - // "noUncheckedIndexedAccess": true, /* Add 'undefined' to a type when accessed using an index. */ - // "noImplicitOverride": true, /* Ensure overriding members in derived classes are marked with an override modifier. */ - // "noPropertyAccessFromIndexSignature": true, /* Enforces using indexed accessors for keys declared using an indexed type. */ - // "allowUnusedLabels": true, /* Disable error reporting for unused labels. */ - // "allowUnreachableCode": true, /* Disable error reporting for unreachable code. */ - - /* Completeness */ - // "skipDefaultLibCheck": true, /* Skip type checking .d.ts files that are included with TypeScript. */ - "skipLibCheck": true /* Skip type checking all .d.ts files. */ - } -}