HomeAssistant
/
PlexMeetsHomeAssistant
mirror of https://github.com/JurajNyiri/PlexMeetsHomeAssistant.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Update: Improve performance by requesting only data that is needed and parallelising calls to Plex where possible

Browse Source
pull/30/head 2.0.10
Juraj Nyíri 3 years ago
parent c64d5ad94d
commit 1b3d3f8572
3 changed files with 190 additions and 115 deletions
Show Stats Download Patch File Download Diff File

155
dist/plex-meets-homeassistant.js vendored
Unescape View File

@ -18675,12 +18675,7 @@ class Plex {
this.requestTimeout = 10000; this.requestTimeout = 10000;
this.sections = []; this.sections = [];
this.init = async () => { this.init = async () => {
await this.getClients(); await Promise.all([this.getSections(), this.getClients(), this.getServerID()]);
/*
setInterval(() => {
this.getClients();
}, 30000);
*/
}; };
this.getClients = async () => { this.getClients = async () => {
const url = this.authorizeURL(`${this.getBasicURL()}/clients`); const url = this.authorizeURL(`${this.getBasicURL()}/clients`);
@ -18719,6 +18714,9 @@ class Plex {
return this.sections; return this.sections;
}; };
this.getSectionData = async (sectionID) => { this.getSectionData = async (sectionID) => {
return this.exportSectionsData([await this.getSectionDataWithoutProcessing(sectionID)]);
};
this.getSectionDataWithoutProcessing = async (sectionID) => {
const bulkItems = 50; const bulkItems = 50;
let url = this.authorizeURL(`${this.getBasicURL()}/library/sections/${sectionID}/all`); let url = this.authorizeURL(`${this.getBasicURL()}/library/sections/${sectionID}/all`);
url += `&sort=${this.sort}`; url += `&sort=${this.sort}`;
@ -18759,7 +18757,7 @@ class Plex {
const sections = await this.getSections(); const sections = await this.getSections();
const sectionsRequests = []; const sectionsRequests = [];
lodash.forEach(sections, section => { lodash.forEach(sections, section => {
sectionsRequests.push(this.getSectionData(section.key)); sectionsRequests.push(this.getSectionDataWithoutProcessing(section.key));
}); });
return this.exportSectionsData(await Promise.all(sectionsRequests)); return this.exportSectionsData(await Promise.all(sectionsRequests));
}; };
@ -20954,73 +20952,114 @@ class PlexMeetsHomeAssistant extends HTMLElement {
await this.playController.init(); await this.playController.init();
} }
await this.plex.init(); await this.plex.init();
try { const plexAllSections = await this.plex.getSections();
const onDeck = await this.plex.getOnDeck(); const getOnDeck = async () => {
this.data.Deck = onDeck.Metadata; if (this.plex) {
} try {
catch (err) { const onDeck = await this.plex.getOnDeck();
if (lodash.includes(err.message, 'Request failed with status code 404')) { this.data.Deck = onDeck.Metadata;
console.warn(getOldPlexServerErrorMessage('Deck')); }
} catch (err) {
else { if (lodash.includes(err.message, 'Request failed with status code 404')) {
throw err; console.warn(getOldPlexServerErrorMessage('Deck'));
} }
} else {
try { throw err;
const continueWatching = await this.plex.getContinueWatching(); }
this.data['Continue Watching'] = continueWatching.Metadata; }
}
catch (err) {
if (lodash.includes(err.message, 'Request failed with status code 404')) {
console.warn(getOldPlexServerErrorMessage('Continue Watching'));
}
else {
throw err;
} }
} };
try { const getContinueWatching = async () => {
const watchNext = await this.plex.getWatchNext(); if (this.plex) {
this.data['Watch Next'] = watchNext.Metadata; try {
} const continueWatching = await this.plex.getContinueWatching();
catch (err) { this.data['Continue Watching'] = continueWatching.Metadata;
if (lodash.includes(err.message, 'Request failed with status code 404')) { }
console.warn(getOldPlexServerErrorMessage('Watch Next')); catch (err) {
if (lodash.includes(err.message, 'Request failed with status code 404')) {
console.warn(getOldPlexServerErrorMessage('Continue Watching'));
}
else {
throw err;
}
}
} }
else { };
throw err; const getWatchNext = async () => {
if (this.plex) {
try {
const watchNext = await this.plex.getWatchNext();
this.data['Watch Next'] = watchNext.Metadata;
}
catch (err) {
if (lodash.includes(err.message, 'Request failed with status code 404')) {
console.warn(getOldPlexServerErrorMessage('Watch Next'));
}
else {
throw err;
}
}
} }
} };
try { const getRecentyAdded = async () => {
const recentlyAdded = await this.plex.getRecentyAdded(); if (this.plex) {
this.data['Recently Added'] = recentlyAdded.Metadata;
}
catch (err) {
if (lodash.includes(err.message, 'Request failed with status code 404')) {
try { try {
console.warn('PlexMeetsHomeAssistant: Using old endpoint for recently added tv shows. Consider updating your Plex server.'); const recentlyAdded = await this.plex.getRecentyAdded();
const recentlyAdded = await this.plex.getRecentyAdded(true);
this.data['Recently Added'] = recentlyAdded.Metadata; this.data['Recently Added'] = recentlyAdded.Metadata;
// eslint-disable-next-line no-shadow
} }
catch (err) { catch (err) {
if (lodash.includes(err.message, 'Request failed with status code 404')) { if (lodash.includes(err.message, 'Request failed with status code 404')) {
console.warn(getOldPlexServerErrorMessage('Recently Added')); try {
console.warn('PlexMeetsHomeAssistant: Using old endpoint for recently added tv shows. Consider updating your Plex server.');
const recentlyAdded = await this.plex.getRecentyAdded(true);
this.data['Recently Added'] = recentlyAdded.Metadata;
// eslint-disable-next-line no-shadow
}
catch (err) {
if (lodash.includes(err.message, 'Request failed with status code 404')) {
console.warn(getOldPlexServerErrorMessage('Recently Added'));
}
else {
throw err;
}
}
} }
else { else {
throw err; throw err;
} }
} }
} }
else { };
throw err; let sectionKey = 0;
lodash.forEach(plexAllSections, (section) => {
if (lodash.isEqual(section.title, this.config.libraryName)) {
sectionKey = section.key;
return false;
} }
} return true;
const [serverID, plexSections] = await Promise.all([this.plex.getServerID(), this.plex.getSectionsData()]);
// eslint-disable-next-line @typescript-eslint/camelcase
this.data.serverID = serverID;
lodash.forEach(plexSections, section => {
this.data[section.title1] = section.Metadata;
}); });
const loadDataRequests = [];
if (sectionKey) {
loadDataRequests.push(this.plex.getSectionData(sectionKey));
}
if (lodash.isEqual(this.config.libraryName, 'Deck')) {
loadDataRequests.push(getOnDeck());
}
else if (lodash.isEqual(this.config.libraryName, 'Continue Watching')) {
loadDataRequests.push(getContinueWatching());
}
else if (lodash.isEqual(this.config.libraryName, 'Watch Next')) {
loadDataRequests.push(getWatchNext());
}
else if (lodash.isEqual(this.config.libraryName, 'Recently Added')) {
loadDataRequests.push(getRecentyAdded());
}
const [plexSections] = await Promise.all(loadDataRequests);
if (plexSections && sectionKey) {
lodash.forEach(plexSections, section => {
this.data[section.title1] = section.Metadata;
});
}
if (this.data[this.config.libraryName] === undefined) { if (this.data[this.config.libraryName] === undefined) {
this.error = `Library name ${this.config.libraryName} does not exist.`; this.error = `Library name ${this.config.libraryName} does not exist.`;
} }

15
src/modules/Plex.ts
Unescape View File

@ -36,12 +36,7 @@ class Plex {
} }
init = async (): Promise<void> => { init = async (): Promise<void> => {
await this.getClients(); await Promise.all([this.getSections(), this.getClients(), this.getServerID()]);
/*
setInterval(() => {
this.getClients();
}, 30000);
*/
}; };
getClients = async (): Promise<Record<string, any>> => { getClients = async (): Promise<Record<string, any>> => {
@ -74,7 +69,7 @@ class Plex {
return this.serverInfo; return this.serverInfo;
}; };
getSections = async (): Promise<any> => { getSections = async (): Promise<Array<Record<string, any>>> => {
if (_.isEmpty(this.sections)) { if (_.isEmpty(this.sections)) {
const url = this.authorizeURL(`${this.getBasicURL()}/library/sections`); const url = this.authorizeURL(`${this.getBasicURL()}/library/sections`);
const sectionsData = await axios.get(url, { const sectionsData = await axios.get(url, {
@ -86,6 +81,10 @@ class Plex {
}; };
getSectionData = async (sectionID: number): Promise<any> => { getSectionData = async (sectionID: number): Promise<any> => {
return this.exportSectionsData([await this.getSectionDataWithoutProcessing(sectionID)]);
};
private getSectionDataWithoutProcessing = async (sectionID: number): Promise<any> => {
const bulkItems = 50; const bulkItems = 50;
let url = this.authorizeURL(`${this.getBasicURL()}/library/sections/${sectionID}/all`); let url = this.authorizeURL(`${this.getBasicURL()}/library/sections/${sectionID}/all`);
url += `&sort=${this.sort}`; url += `&sort=${this.sort}`;
@ -137,7 +136,7 @@ class Plex {
const sections = await this.getSections(); const sections = await this.getSections();
const sectionsRequests: Array<Promise<any>> = []; const sectionsRequests: Array<Promise<any>> = [];
_.forEach(sections, section => { _.forEach(sections, section => {
sectionsRequests.push(this.getSectionData(section.key)); sectionsRequests.push(this.getSectionDataWithoutProcessing(section.key));
}); });
return this.exportSectionsData(await Promise.all(sectionsRequests)); return this.exportSectionsData(await Promise.all(sectionsRequests));
}; };

135
src/plex-meets-homeassistant.ts
Unescape View File

@ -319,70 +319,107 @@ class PlexMeetsHomeAssistant extends HTMLElement {
await this.playController.init(); await this.playController.init();
} }
await this.plex.init(); await this.plex.init();
const plexAllSections = await this.plex.getSections();
try { const getOnDeck = async (): Promise<void> => {
const onDeck = await this.plex.getOnDeck(); if (this.plex) {
this.data.Deck = onDeck.Metadata; try {
} catch (err) { const onDeck = await this.plex.getOnDeck();
if (_.includes(err.message, 'Request failed with status code 404')) { this.data.Deck = onDeck.Metadata;
console.warn(getOldPlexServerErrorMessage('Deck')); } catch (err) {
} else { if (_.includes(err.message, 'Request failed with status code 404')) {
throw err; console.warn(getOldPlexServerErrorMessage('Deck'));
} else {
throw err;
}
}
} }
} };
const getContinueWatching = async (): Promise<void> => {
try { if (this.plex) {
const continueWatching = await this.plex.getContinueWatching(); try {
this.data['Continue Watching'] = continueWatching.Metadata; const continueWatching = await this.plex.getContinueWatching();
} catch (err) { this.data['Continue Watching'] = continueWatching.Metadata;
if (_.includes(err.message, 'Request failed with status code 404')) { } catch (err) {
console.warn(getOldPlexServerErrorMessage('Continue Watching')); if (_.includes(err.message, 'Request failed with status code 404')) {
} else { console.warn(getOldPlexServerErrorMessage('Continue Watching'));
throw err; } else {
throw err;
}
}
} }
} };
const getWatchNext = async (): Promise<void> => {
try { if (this.plex) {
const watchNext = await this.plex.getWatchNext(); try {
this.data['Watch Next'] = watchNext.Metadata; const watchNext = await this.plex.getWatchNext();
} catch (err) { this.data['Watch Next'] = watchNext.Metadata;
if (_.includes(err.message, 'Request failed with status code 404')) { } catch (err) {
console.warn(getOldPlexServerErrorMessage('Watch Next')); if (_.includes(err.message, 'Request failed with status code 404')) {
} else { console.warn(getOldPlexServerErrorMessage('Watch Next'));
throw err; } else {
throw err;
}
}
} }
} };
const getRecentyAdded = async (): Promise<void> => {
try { if (this.plex) {
const recentlyAdded = await this.plex.getRecentyAdded();
this.data['Recently Added'] = recentlyAdded.Metadata;
} catch (err) {
if (_.includes(err.message, 'Request failed with status code 404')) {
try { try {
console.warn( const recentlyAdded = await this.plex.getRecentyAdded();
'PlexMeetsHomeAssistant: Using old endpoint for recently added tv shows. Consider updating your Plex server.'
);
const recentlyAdded = await this.plex.getRecentyAdded(true);
this.data['Recently Added'] = recentlyAdded.Metadata; this.data['Recently Added'] = recentlyAdded.Metadata;
// eslint-disable-next-line no-shadow
} catch (err) { } catch (err) {
if (_.includes(err.message, 'Request failed with status code 404')) { if (_.includes(err.message, 'Request failed with status code 404')) {
console.warn(getOldPlexServerErrorMessage('Recently Added')); try {
console.warn(
'PlexMeetsHomeAssistant: Using old endpoint for recently added tv shows. Consider updating your Plex server.'
);
const recentlyAdded = await this.plex.getRecentyAdded(true);
this.data['Recently Added'] = recentlyAdded.Metadata;
// eslint-disable-next-line no-shadow
} catch (err) {
if (_.includes(err.message, 'Request failed with status code 404')) {
console.warn(getOldPlexServerErrorMessage('Recently Added'));
} else {
throw err;
}
}
} else { } else {
throw err; throw err;
} }
} }
} else {
throw err;
} }
} };
const [serverID, plexSections] = await Promise.all([this.plex.getServerID(), this.plex.getSectionsData()]); let sectionKey: number | false = 0;
// eslint-disable-next-line @typescript-eslint/camelcase _.forEach(plexAllSections, (section: Record<string, any>) => {
this.data.serverID = serverID; if (_.isEqual(section.title, this.config.libraryName)) {
_.forEach(plexSections, section => { sectionKey = section.key;
this.data[section.title1] = section.Metadata; return false;
}
return true;
}); });
const loadDataRequests = [];
if (sectionKey) {
loadDataRequests.push(this.plex.getSectionData(sectionKey));
}
if (_.isEqual(this.config.libraryName, 'Deck')) {
loadDataRequests.push(getOnDeck());
} else if (_.isEqual(this.config.libraryName, 'Continue Watching')) {
loadDataRequests.push(getContinueWatching());
} else if (_.isEqual(this.config.libraryName, 'Watch Next')) {
loadDataRequests.push(getWatchNext());
} else if (_.isEqual(this.config.libraryName, 'Recently Added')) {
loadDataRequests.push(getRecentyAdded());
}
const [plexSections] = await Promise.all(loadDataRequests);
if (plexSections && sectionKey) {
_.forEach(plexSections, section => {
this.data[section.title1] = section.Metadata;
});
}
if (this.data[this.config.libraryName] === undefined) { if (this.data[this.config.libraryName] === undefined) {
this.error = `Library name ${this.config.libraryName} does not exist.`; this.error = `Library name ${this.config.libraryName} does not exist.`;

Write Preview
Loading…
Cancel
Save