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

Write Preview
Loading…
Cancel
Save