update to version 2.0

.dockerignore

@@ -1,24 +0,0 @@
-**/.classpath
-**/.dockerignore
-**/.env
-**/.git
-**/.gitignore
-**/.project
-**/.settings
-**/.toolstarget
-**/.vs
-**/.vscode
-**/*.*proj.user
-**/*.dbmdl
-**/*.jfm
-**/azds.yaml
-**/charts
-**/docker-compose*
-**/compose*
-**/Dockerfile*
-**/node_modules
-**/npm-debug.log
-**/obj
-**/secrets.dev.yaml
-**/values.dev.yaml
-README.md

LICENSE

@@ -1,21 +1,201 @@
-MIT License
+Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
 
-Copyright (c) 2021 Silas Alves
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
 
-Permission is hereby granted, free of charge, to any person obtaining a copy
+   1. Definitions.
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
 
-The above copyright notice and this permission notice shall be included in all
+      "License" shall mean the terms and conditions for use, reproduction,
-copies or substantial portions of the Software.
+      and distribution as defined by Sections 1 through 9 of this document.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+      "Licensor" shall mean the copyright owner or entity authorized by
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+      the copyright owner that is granting the License.
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+      "Legal Entity" shall mean the union of the acting entity and all
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+      other entities that control, are controlled by, or are under common
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+      control with that entity. For the purposes of this definition,
-SOFTWARE.
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

configure.html

@@ -182,7 +182,7 @@
         />
       </div>
       <h1 class="name">The Movie Database Addon</h1>
-      <h2 class="version">0.2.0</h2>
+      <h2 class="version">2.0.0</h2>
       <h2 class="description">TMDB API for Stremio.</h2>
 
       <div class="separator"></div>

index.js

@@ -4,9 +4,13 @@ const { getSearch } = require("./lib/getSearch");
 const { getGenres } = require("./lib/getGenres");
 const { getManifest, DEFAULT_LANGUAGE } = require("./lib/getManifest");
 const { getMeta } = require("./lib/getMeta");
+const { getTmdb } = require("./lib/getTmdb");
+const { cacheWrapMeta } = require("./lib/getCache");
 const addon = express();
 const path = require("path");
-const { getTmdb } = require("./lib/getTmdb");
+
+
+const CACHE_MAX_AGE = process.env.CACHE_MAX_AGE || 12 * 60 * 60; // 12 hours
 
 const getCacheHeaders = function (opts) {
   opts = opts || {};
@@ -124,7 +128,7 @@ addon.get("/:language?/meta/:type/:id.json", async function (req, res) {
     const language = req.params.language || DEFAULT_LANGUAGE;
     const type = req.params.type;
     const tmdbId = req.params.id.split(":")[1];
-    const resp = await getMeta(type, language, tmdbId);
+    const resp = await getMeta(type, language, tmdbId)
     const cacheOpts = {
       staleRevalidate: 20 * 24 * 60 * 60, // 20 days
       staleError: 30 * 24 * 60 * 60, // 30 days

lib/getCache.js

@@ -0,0 +1,53 @@
+const cacheManager = require('cache-manager');
+const mangodbStore = require('cache-manager-mongodb');
+
+const GLOBAL_KEY_PREFIX = 'tmdb-addon';
+const META_KEY_PREFIX = `${GLOBAL_KEY_PREFIX}|meta`;
+const CATALOG_KEY_PREFIX = `${GLOBAL_KEY_PREFIX}|catalog`;
+
+const META_TTL = process.env.META_TTL || 24 * 60 * 60; // 1 day
+const CATALOG_TTL = process.env.CATALOG_TTL || 24 * 60 * 60; // 1 day
+
+const MONGO_URI = process.env.MONGODB_URI;
+const NO_CACHE = process.env.NO_CACHE || false;
+
+const cache = initiateCache();
+
+function initiateCache() {
+  if (NO_CACHE) {
+    return null;
+  } else if (!NO_CACHE && MONGO_URI) {
+    return cacheManager.caching({
+      store: mangodbStore,
+      uri: MONGO_URI,
+      options: {
+        collection: 'tmdb_collection',
+        ttl: META_TTL
+      },
+      ttl: META_TTL,
+      ignoreCacheErrors: true
+    });
+  } else {
+    return cacheManager.caching({
+      store: 'memory',
+      ttl: META_TTL
+    });
+  }
+}
+
+function cacheWrap(key, method, options) {
+  if (NO_CACHE || !cache) {
+    return method();
+  }
+  return cache.wrap(key, method, options);
+}
+
+function cacheWrapCatalog(id, method) {
+  return cacheWrap(`${CATALOG_KEY_PREFIX}:${id}`, method, { ttl: CATALOG_TTL });
+}
+
+function cacheWrapMeta(id, method) {
+  return cacheWrap(`${META_KEY_PREFIX}:${id}`, method, { ttl: META_TTL });
+}
+
+module.exports = { cacheWrapCatalog, cacheWrapMeta };

lib/getCatalog.js

@@ -1,44 +1,24 @@
-require('dotenv').config()
+require("dotenv").config();
+const axios = require("axios");
+const path = require("path");
 const { MovieDb } = require("moviedb-promise");
 const moviedb = new MovieDb(process.env.tmdb_api);
-const { getCredits } = require("./getCredits");
-const { getDirector } = require("./getDirector");
 
 async function getCatalog(type, language, page) {
   if (type === "movie") {
     const catalog = moviedb
       .discoverMovie({ language: language, page: page, include_adult: "false" })
       .then(async (res) => {
-        const resp = res.results;
+        const metas = await Promise.all(
-        const metas = await Promise.all(resp.map(async (el) => {
+          res.results.map(async (el) => {
-          var tmdbId = el.id
+            const meta = await axios.get(
-          const cast = await getCredits(type, language, tmdbId);
+              path.join(
-          const director = await getDirector(type, language, tmdbId);
+                __dirname + `/${language}/meta/movie/tmdb:${el.id}.json`
-          let { genres } = await moviedb
+              )
-          .movieInfo({ id: tmdbId, language: language })
+            );
-          .then((res) => {
+            return meta.data.meta;
-            const resp = res;
-            return resp;
           })
-          .catch(console.error);
+        );
-          const genero = genres.map((el) => {
-            return el.name;
-          });
-          const year = (el.release_date == null) ? '' : el.release_date.substr(0, 4);
-          return {
-            id: `tmdb:${el.id}`,
-            name: `${el.title}`,
-            genre: genero,
-            poster: `https://image.tmdb.org/t/p/w500${el.poster_path}`,
-            posterShape: "regular",
-            imdbRating: `${el.vote_average}`,
-            year: year,
-            cast: cast,
-            director: director,
-            type: `${type}`,
-            description: `${el.overview}`,
-          };
-        }));
         return Promise.resolve({ metas });
       })
       .catch(console.error);
@@ -47,40 +27,16 @@ async function getCatalog(type, language, page) {
     const catalog = moviedb
       .discoverTv({ language: language, page: page, include_adult: "false" })
       .then(async (res) => {
-        const resp = res.results;
+        const metas = await Promise.all(
-        const metas = await Promise.all(resp.map(async (el) => {
+          res.results.map(async (el) => {
-          var tmdbId = el.id
+            const meta = await axios.get(
-          const cast = await getCredits(type, language, tmdbId);
+              path.join(
-          let { genres, first_air_date, last_air_date, status } = await moviedb
+                __dirname + `/${language}/meta/series/tmdb:${el.id}.json`
-          .tvInfo({ id: tmdbId, language: language })
+              )
-          .then((res) => {
+            );
-            const resp = res;
+            return meta.data.meta;
-            return resp;
           })
-          .catch(console.error);
+        );
-          const genero = genres.map((el) => {
-            return el.name;
-          });
-          function year() {
-            if (status === "Ended") {
-              return first_air_date.substr(0, 5) + last_air_date.substr(0, 4);
-            } else {
-              return (first_air_date == null) ? null : first_air_date.substr(0, 5);
-            }
-          }
-          return {
-            id: `tmdb:${el.id}`,
-            name: `${el.name}`,
-            genre: genero,
-            poster: `https://image.tmdb.org/t/p/w500${el.poster_path}`,
-            posterShape: "regular",
-            imdbRating: `${el.vote_average}`,
-            year: year(),
-            cast: cast,
-            type: `${type}`,
-            description: `${el.overview}`,
-          };
-        }));
         return Promise.resolve({ metas });
       })
       .catch(console.error);

lib/getCredits.js

@@ -1,33 +0,0 @@
-require('dotenv').config()
-const { MovieDb } = require("moviedb-promise");
-const moviedb = new MovieDb(process.env.tmdb_api);
-
-async function getCredits(type, language, tmdbId) {
-  if (type === "movie") {
-    const catalog = moviedb
-      .movieCredits({ language: language, id: tmdbId })
-      .then((res) => {
-        const resp = res.cast;
-        const cast = resp.slice(0, 4).map((el) => {
-          return el.name;
-        });
-        return cast;
-      })
-      .catch(console.error);
-    return catalog
-  } else {
-    const catalog = moviedb
-      .tvCredits({ language: language, id: tmdbId })
-      .then((res) => {
-        const resp = res.cast;
-        const cast = resp.slice(0, 4).map((el) => {
-          return el.name;
-        });
-        return cast;
-      })
-      .catch(console.error);
-    return catalog
-  }
-}
-
-module.exports = { getCredits };

lib/getDirector.js

@@ -1,29 +0,0 @@
-require('dotenv').config()
-const { MovieDb } = require("moviedb-promise");
-const moviedb = new MovieDb(process.env.tmdb_api);
-
-async function getDirector(type, language, tmdbId) {
-  if (type === "movie") {
-    const catalog = moviedb
-      .movieCredits({ language: language, id: tmdbId })
-      .then((res) => {
-        const resp = res.crew;
-        const director = resp.filter((x) => x.job === "Director").map(el => { return el.name});
-        return director;
-      })
-      .catch(console.error);
-    return catalog
-  } else {
-    const catalog = moviedb
-      .tvCredits({ language: language, id: tmdbId })
-      .then((res) => {
-        const resp = res.crew;
-        const director = resp.filter((x) => x.job === "Director").map(el => { return el.name});
-        return director;
-      })
-      .catch(console.error);
-    return catalog
-  }
-}
-
-module.exports = { getDirector };

lib/getEpisodes.js

@@ -55,7 +55,7 @@ async function getEpisodes(language, tmdbId, imdb_id, seasons) {
           .reduce((a, b) => a.concat(b), [])
       );
   } else {
-    const episodes = seasons.map((el) => {
+    const episodes = await Promise.all(seasons.map(async (el) => {
       const season = moviedb
         .seasonInfo({
           language: language,
@@ -69,14 +69,14 @@ async function getEpisodes(language, tmdbId, imdb_id, seasons) {
                 imdb_id !== null
                   ? `${imdb_id}:${el.season_number}:${index + 1}`
                   : `tmdb:${tmdbId}:${el.season_number}:${index + 1}`,
-              name: `${el.name}`,
+              name: el.name,
-              season: `${el.season_number}`,
+              season: el.season_number,
-              //            number: `${index + 1}`,
+              number: index + 1,
-              episode: `${index + 1}`,
+              episode: index + 1,
-              //            thumbnail: `https://image.tmdb.org/t/p/w500${el.still_path}`,
+              thumbnail: `https://image.tmdb.org/t/p/w500${el.still_path}`,
-              overview: `${el.overview}`,
+              overview: el.overview,
-              description: `${el.overview}`,
+              description: el.overview,
-              rating: `${el.vote_average}`,
+              rating: el.vote_average,
               firstAired: new Date(Date.parse(el.air_date) + el.season_number),
               released: new Date(Date.parse(el.air_date) + el.season_number),
             };
@@ -85,11 +85,8 @@ async function getEpisodes(language, tmdbId, imdb_id, seasons) {
         })
         .catch(console.error);
       return season;
-    });
+    }));
-    return (async () => {
+    return episodes
-      const resultado = await Promise.all(episodes);
-      return resultado;
-    })();
   }
 }
 

lib/getExternal.js

@@ -1,27 +0,0 @@
-require('dotenv').config()
-const { MovieDb } = require("moviedb-promise");
-const moviedb = new MovieDb(process.env.tmdb_api);
-
-async function getExternal(type, tmdbId) {
-  if (type === "movie") {
-    const catalog = moviedb
-      .movieExternalIds({ id: tmdbId })
-      .then((res) => {
-        const resp = res;
-        return resp;
-      })
-      .catch(console.error);
-    return catalog
-  } else {
-    const catalog = moviedb
-      .tvExternalIds({ id: tmdbId })
-      .then((res) => {
-        const resp = res;
-        return resp;
-      })
-      .catch(console.error);
-    return catalog
-  }
-}
-
-module.exports = { getExternal };

lib/getGenres.js

@@ -1,8 +1,8 @@
-require('dotenv').config()
+require("dotenv").config();
+const axios = require("axios");
+const path = require("path");
 const { MovieDb } = require("moviedb-promise");
 const { getGenreList } = require("./getGenreList");
-const { getCredits } = require("./getCredits");
-const { getDirector } = require("./getDirector");
 const moviedb = new MovieDb(process.env.tmdb_api);
 
 function isNumeric(value) {
@@ -17,114 +17,68 @@ async function getGenres(type, language, genre, page) {
         language: language,
         page: page,
         primary_release_year: genre,
-        include_adult: "false"
+        include_adult: "false",
       };
-    } 
+    } else {
-    else {
       const gen_name = genre_id.find((x) => x.name === genre).id;
       var parameters = {
         language: language,
         page: page,
         with_genres: gen_name,
-        include_adult: "false"
+        include_adult: "false",
       };
     }
     const catalog = moviedb
       .discoverMovie(parameters)
       .then(async (res) => {
-        const resp = res.results;
+        const metas = await Promise.all(
-        const metas = await Promise.all(resp.map(async (el) => {
+          res.results.map(async (el) => {
-          var tmdbId = el.id
+            const meta = await axios.get(
-          const cast = await getCredits(type, language, tmdbId);
+              path.join(
-          const director = await getDirector(type, language, tmdbId);
+                __dirname + `/${language}/meta/movie/tmdb:${el.id}.json`
-          let { genres } = await moviedb
+              )
-          .movieInfo({ id: tmdbId, language: language })
+            );
-          .then((res) => {
+            return meta.data.meta;
-            const resp = res;
-            return resp;
           })
-          .catch(console.error);
+        );
-          const genero = genres.map((el) => {
-            return el.name;
-          });
-          const year = (el.release_date == null) ? '' : el.release_date.substr(0, 4);
-          return {
-            id: `tmdb:${el.id}`,
-            name: `${el.title}`,
-            genre: genero,
-            poster: `https://image.tmdb.org/t/p/w500${el.poster_path}`,
-            posterShape: "regular",
-            imdbRating: `${el.vote_average}`,
-            year: year,
-            cast: cast,
-            director: [`${director}`],
-            type: `${type}`,
-            description: `${el.overview}`,
-          };
-        }));
         return Promise.resolve({ metas });
       })
       .catch(console.error);
-    return catalog
+    return catalog;
   } else {
     if (isNumeric(genre)) {
       var parameters = {
         language: language,
         page: page,
         first_air_date_year: genre,
-        include_adult: "false"
+        include_adult: "false",
       };
-    } 
+    } else {
-    else {
       const gen_name = genre_id.find((x) => x.name === genre).id;
       var parameters = {
         language: language,
         page: page,
         with_genres: gen_name,
-        include_adult: "false"
+        include_adult: "false",
       };
     }
     const catalog = moviedb
       .discoverTv(parameters)
       .then(async (res) => {
-        const resp = res.results;
+        const metas = await Promise.all(
-        const metas = await Promise.all(resp.map(async (el) => {
+          res.results.map(async (el) => {
-          var tmdbId = el.id
+            const meta = await axios.get(
-          const cast = await getCredits(type, language, tmdbId);
+              path.join(
-          let { genres, first_air_date, last_air_date, status } = await moviedb
+                __dirname + `/${language}/meta/series/tmdb:${el.id}.json`
-          .tvInfo({ id: tmdbId, language: language })
+              )
-          .then((res) => {
+            );
-            const resp = res;
+            return meta.data.meta;
-            return resp;
           })
-          .catch(console.error);
+        );
-          const genero = genres.map((el) => {
-            return el.name;
-          });
-          function year() {
-            if (status === "Ended") {
-              return first_air_date.substr(0, 5) + last_air_date.substr(0, 4);
-            } else {
-              return (first_air_date == null) ? null : first_air_date.substr(0, 5);
-            }
-          }
-          return {
-            id: `tmdb:${el.id}`,
-            name: `${el.name}`,
-            genre: genero,
-            poster: `https://image.tmdb.org/t/p/w500${el.poster_path}`,
-            posterShape: "regular",
-            imdbRating: `${el.vote_average}`,
-            year: year(),
-            cast: cast,
-            type: `${type}`,
-            description: `${el.overview}`,
-          };
-        }));
         return Promise.resolve({ metas });
       })
       .catch(console.error);
-    return catalog
+    return catalog;
   }
 }
 

lib/getManifest.js

@@ -40,7 +40,7 @@ async function getManifest(language = DEFAULT_LANGUAGE) {
   const descriptionSuffix = language && language !== DEFAULT_LANGUAGE ? ` with ${language} language.` : '.';
   return {
     id: "tmdb.addon",
-    version: "0.2.0",
+    version: "2.0.0",
     icon: "https://i.imgur.com/P8SAWo5.png",
     background: "https://i.imgur.com/1lm1XaK.png",
     name: "The Movie Database Addon",

lib/getMeta.js

@@ -1,132 +1,122 @@
-require('dotenv').config()
+require("dotenv").config();
 const { MovieDb } = require("moviedb-promise");
-const { getCredits } = require("./getCredits");
-const { getDirector } = require("./getDirector");
-const { getExternal } = require("./getExternal");
-const { getVideos } = require("./getVideos");
 const { getEpisodes } = require("./getEpisodes");
 const { getLogo, getTvLogo } = require("./getLogo");
 const moviedb = new MovieDb(process.env.tmdb_api);
 
 async function getMeta(type, language, tmdbId) {
   if (type === "movie") {
-    const videos = await getVideos(type, language, tmdbId);
+      const meta = await moviedb
-    const cast = await getCredits(type, language, tmdbId);
+        .movieInfo({
-    const director = await getDirector(type, language, tmdbId);
+          id: tmdbId,
-    const metas = moviedb
+          language: language,
-      .movieInfo({ id: tmdbId, language: language })
+          append_to_response: "videos,credits",
-      .then((res) => {
+        })
-        const resp = res;
+        .then(async (res) => {
-        return resp;
+          const logo = await getLogo(tmdbId, language, res.original_language);
-      })
+          const metas = {
-      .catch(console.error);
+            id: `tmdb:${tmdbId}`,
-    let {
+            imdb_id: res.imdb_id,
-      title,
+            type: type,
-      imdb_id,
+            name: res.title,
-      poster_path,
+            slug: `movie/${res.title.toLowerCase().replace(/ /g, "-")}-${
-      genres,
+              res.imdb_id == null ? null : res.imdb_id.replace("tt", "")
-      overview,
+            }`,
-      vote_average,
+            imdbRating: res.vote_average,
-      release_date,
+            genres: res.genres.map((el) => {
-      runtime,
+              return el.name;
-      backdrop_path,
+            }),
-      original_language,
+            cast: res.credits.cast.slice(0, 4).map((el) => {
-    } = await metas;
+              return el.name;
-    const logo = await getLogo(tmdbId, language, original_language);
+            }),
-    const genero = genres.map((el) => {
+            director: res.credits.crew
-      return el.name;
+              .filter((x) => x.job === "Director")
-    });
+              .map((el) => {
-    let meta = {
+                return el.name;
-      id: `tmdb:${tmdbId}`,
+              }),
-      imdb_id: `${imdb_id}`,
+            poster: `https://image.tmdb.org/t/p/w500${res.poster_path}`,
-      type: type,
+            posterShape: "regular",
-      name: `${title}`,
+            description: res.overview,
-      slug: `movie/${title.toLowerCase().split(' ').join('-')}-${(imdb_id == null) ? null : imdb_id.replace('tt', '')}`,
+            runtime: res.runtime ? `${res.runtime} min` : "",
-      imdbRating: `${vote_average}`,
+            background: `https://image.tmdb.org/t/p/original${res.backdrop_path}`,
-      genres: genero,
+            logo: logo,
-      cast: cast,
+            releaseInfo: res.release_date
-      director: director,
+              ? `${res.release_date.substr(0, 4)}`
-      poster: `https://image.tmdb.org/t/p/w500${poster_path}`,
+              : "",
-      posterShape: "regular",
+            trailers: res.videos.results.map((el) => {
-      description: `${overview}`,
+              return {
-      runtime: (runtime !== null) ? `${runtime} min` : '',
+                source: `${el.key}`,
-      background: `https://image.tmdb.org/t/p/original${backdrop_path}`,
+                type: `${el.type}`,
-      logo: logo,
+              };
-      releaseInfo: (release_date !== null) ? `${release_date.substr(0, 4)}` : '',
+            }),
-      trailers: videos,
+            behaviorHints: {
-      behaviorHints: {
+              defaultVideoId: res.imdb_id,
-        defaultVideoId: imdb_id
+            },
-      },
+            videos: [
-      videos: [
+              {
-        {
+                id: res.imdb_id,
-          id: imdb_id,
+                title: "",
-          title: '',
+                released: new Date(res.release_date).toISOString(),
-          released: new Date(release_date).toISOString(),
+              },
-        }
+            ],
-      ]
+          };
-    };
+          return metas
-    return Promise.resolve({ meta });
+        })
+        .catch();
+    return Promise.resolve({meta})
   } else {
-    const videos = await getVideos(type, language, tmdbId);
+    const meta = await moviedb
-    const cast = await getCredits(type, language, tmdbId);
+      .tvInfo({ id: tmdbId, language: language, append_to_response: "videos,credits,external_ids" })
-    let { imdb_id, tvdb_id } = await getExternal(type, tmdbId);
+      .then(async (res) => {
-    const metas = moviedb
+        const logo = await getTvLogo(res.external_ids.tvdb_id, language, res.original_language);
-      .tvInfo({ id: tmdbId, language: language })
+        const mapEpisodes = await getEpisodes(language, tmdbId, res.external_ids.imdb_id, res.seasons);
-      .then((res) => {
+        function year() {
-        const resp = res;
+          if (res.status === "Ended") {
-        return resp;
+            return res.first_air_date !== null
+              ? res.first_air_date.substr(0, 5) + res.last_air_date.substr(0, 4)
+              : "";
+          } else {
+            return res.first_air_date !== null ? res.first_air_date.substr(0, 5) : "";
+          }
+        }
+
+        const metas = {
+          id: `tmdb:${tmdbId}`,
+          imdb_id: res.external_ids.imdb_id,
+          type: type,
+          name: res.name,
+          slug: `series/${res.name.toLowerCase().replace(/ /g, "-")}-${
+            res.external_ids.imdb_id == null ? null : res.external_ids.imdb_id.replace("tt", "")
+          }`,
+          imdbRating: res.vote_average,
+          genres: res.genres.map((el) => {
+            return el.name;
+          }),
+          cast: res.credits.cast.slice(0, 4).map((el) => {
+            return el.name;
+          }),
+          writer: res.created_by.map((el) => {
+            return el.name;
+          }),
+          poster: `https://image.tmdb.org/t/p/w500${res.poster_path}`,
+          posterShape: "regular",
+          description: res.overview,
+          runtime:
+            res.episode_run_time ? `${res.episode_run_time.slice(0, 1)} min` : "",
+          background: `https://image.tmdb.org/t/p/original${res.backdrop_path}`,
+          logo: logo,
+          releaseInfo: year(),
+          trailers: res.videos.results.map((el) => {
+            return {
+              source: `${el.key}`,
+              type: `${el.type}`,
+            };
+          }),
+          videos: [].concat(...mapEpisodes),
+        };
+        return metas
       })
-      .catch(console.error);
+      .catch();
-    let {
-      name,
-      poster_path,
-      genres,
-      overview,
-      vote_average,
-      first_air_date,
-      last_air_date,
-      episode_run_time,
-      backdrop_path,
-      seasons,
-      created_by,
-      status,
-      original_language,
-    } = await metas;
-    const logo = await getTvLogo(tvdb_id, language, original_language);
-    const genero = genres.map((el) => {
-      return el.name;
-    });
-    const writer = created_by.slice(0, 1).map((el) => {
-      return el.name;
-    });
-    function year() {
-      if (status === "Ended") {
-        return (first_air_date !== null) ? first_air_date.substr(0, 5) + last_air_date.substr(0, 4) : '';
-      } else {
-        return (first_air_date !== null) ? first_air_date.substr(0, 5) : '';
-      }
-    }
-    const mapEpisodes = await getEpisodes(language, tmdbId, imdb_id, seasons);
-    let meta = {
-      id: `tmdb:${tmdbId}`,
-      imdb_id: `${imdb_id}`,
-      type: type,
-      name: `${name}`,
-      slug: `series/${name.toLowerCase().split(' ').join('-')}-${(imdb_id == null) ? null : imdb_id.replace('tt', '')}`,
-      imdbRating: `${vote_average}`,
-      genres: genero,
-      cast: cast,
-      writer: writer,
-      poster: `https://image.tmdb.org/t/p/w500${poster_path}`,
-      posterShape: "regular",
-      description: `${overview}`,
-      runtime: (episode_run_time !== null) ? `${episode_run_time.slice(0, 1)} min` : '',
-      background: `https://image.tmdb.org/t/p/original${backdrop_path}`,
-      logo: logo,
-      releaseInfo: year(),
-      trailers: videos,
-      videos: [].concat(...mapEpisodes),
-    };
     return Promise.resolve({ meta });
   }
 }

lib/getSearch.js

@@ -1,4 +1,6 @@
 require('dotenv').config()
+const axios = require('axios')
+const path = require("path");
 const { MovieDb } = require("moviedb-promise");
 const moviedb = new MovieDb(process.env.tmdb_api);
 
@@ -6,16 +8,11 @@ async function getSearch(type, language, query) {
   if (type === "movie") {
     const catalog = moviedb
       .searchMovie({ query: query, language: language, include_adult: 'false' })
-      .then((res) => {
+      .then(async (res) => {
-        const resp = res.results;
+        const metas = await Promise.all(res.results.map(async(el) => {
-        const metas = resp.map((el) => {
+          const meta = await axios.get(path.join(__dirname + `/${language}/meta/movie/tmdb:${el.id}.json`))
-          return {
+          return meta.data.meta
-            id: `tmdb:${el.id}`,
+        }));
-            name: `${el.title}`,
-            poster: `https://image.tmdb.org/t/p/w500${el.poster_path}`,
-            type: `${type}`,
-          };
-        });
         return Promise.resolve({ metas });
       })
       .catch(console.error);
@@ -23,16 +20,11 @@ async function getSearch(type, language, query) {
   } else {
     const catalog = moviedb
       .searchTv({ query: query, language: language, include_adult: 'false' })
-      .then((res) => {
+      .then(async (res) => {
-        const resp = res.results;
+        const metas = await Promise.all(res.results.map(async(el) => {
-        const metas = resp.map((el) => {
+          const meta = await axios.get(path.join(__dirname + `/${language}/meta/series/tmdb:${el.id}.json`))
-          return {
+          return meta.data.meta
-            id: `tmdb:${el.id}`,
+        }));
-            name: `${el.name}`,
-            poster: `https://image.tmdb.org/t/p/w500${el.poster_path}`,
-            type: `${type}`,
-          };
-        });
         return Promise.resolve({ metas });
       })
       .catch(console.error);

lib/getVideos.js

@@ -1,39 +0,0 @@
-require('dotenv').config()
-const { MovieDb } = require("moviedb-promise");
-const moviedb = new MovieDb(process.env.tmdb_api);
-
-async function getVideos(type, language, tmdbId) {
-  if (type === "movie") {
-    const catalog = moviedb
-      .movieVideos({ language: language, id: tmdbId })
-      .then((res) => {
-        const resp = res.results;
-        const videos = resp.map((el) => {
-          return {
-            source: `${el.key}`,
-            type: `${el.type}`,
-          };
-        });
-        return videos;
-      })
-      .catch(console.error);
-    return catalog
-  } else {
-    const catalog = moviedb
-      .tvVideos({ language: language, id: tmdbId })
-      .then((res) => {
-        const resp = res.results;
-        const videos = resp.map((el) => {
-          return {
-            source: `${el.key}`,
-            type: `${el.type}`,
-          };
-        });
-        return videos;
-      })
-      .catch(console.error);
-    return catalog
-  }
-}
-
-module.exports = { getVideos };

now.json

@@ -1,5 +0,0 @@
-{
-  "version": 2,
-  "builds": [{ "src": "server.js", "use": "@now/node" }],
-  "routes": [{ "src": "/.*", "dest": "/server.js" }]
-}

package.json

@@ -1,15 +1,34 @@
 {
-  "name": "tmdb.addon",
+  "name": "tmdb-addon",
-  "version": "0.2.0",
+  "version": "2.0.0",
-  "description": "TMDB API for Stremio.",
+  "description": "Multilingual metadata provided by TMDB.",
-  "scripts": {
+  "main": "server.js",
-    "start": "node server.js",
-	"run": "node server.js"
-  },
   "dependencies": {
+    "axios": "^0.21.1",
+    "cache-manager": "^3.4.4",
+    "cache-manager-mongodb": "^0.3.0",
     "dotenv": "^10.0.0",
     "express": "^4.17.1",
     "fanart.tv-api": "^2.0.1",
-    "moviedb-promise": "^3.1.6"
+    "moviedb-promise": "^3.1.9"
-  }
+  },
+  "devDependencies": {},
+  "scripts": {
+    "start": "node server.js"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/mrcanelas/tmdb-addon.git"
+  },
+  "keywords": [
+    "tmdb",
+    "stremio",
+    "addon"
+  ],
+  "author": "mrcanelas",
+  "license": "Apache-2.0",
+  "bugs": {
+    "url": "https://github.com/mrcanelas/tmdb-addon/issues"
+  },
+  "homepage": "https://github.com/mrcanelas/tmdb-addon#readme"
 }