node-csfd-api 3.0.0-next.1 → 3.0.0-next.3

package/README.md

@@ -3,7 +3,7 @@
 [![Build & Publish](https://github.com/bartholomej/node-csfd-api/workflows/Publish/badge.svg)](https://github.com/bartholomej/node-csfd-api/actions)
 [![codecov](https://codecov.io/gh/bartholomej/node-csfd-api/branch/master/graph/badge.svg?token=YQH9UoVrGP)](https://codecov.io/gh/bartholomej/node-csfd-api)
 
-# CSFD API 2022
+# CSFD API 2023
 
 > JavaScript NPM library for scraping **Czech Movie Database (csfd.cz)**
 >
@@ -173,6 +173,19 @@ movies: [
     }
   }
 ],
+tvSeries: [
+  {
+    id: 71924,
+    title: 'Království',
+    year: 1994,
+    url: 'https://www.csfd.cz/film/71924-kralovstvi/',
+    type: 'seriál',
+    colorRating: 'good',
+    poster: 'https://image.pmgstatic.com/cache/resized/w60h85/files/images/film/posters/166/708/166708064_2da697.jpg',
+    origins: ['Dánsko'],
+    creators: []
+  }
+],
 users: [
   {
     id: 912,
@@ -381,8 +394,8 @@ _Note: You can not use both parameters 'includesOnly' and 'excludes'. Parameter
 - [ ] Search
   - [x] Movies
   - [x] Users
+  - [x] TV Series
   - [ ] Creators
-  - [ ] TV Series
 - [x] Creators
   - [x] Bio
   - [x] Movies (TODO categories)
@@ -443,7 +456,7 @@ That's why, with node-csfd-api, what happens on your device stays on your device
 
 ## License
 
-Copyright © 2022 [Lukas Bartak](http://bartweb.cz)
+Copyright © 2020 – 2023 [Lukas Bartak](http://bartweb.cz)
 
 Proudly powered by nature 🗻, wind 💨, tea 🍵 and beer 🍺 ;)
 

package/cjs/fetchers/index.js

@@ -1,5 +1,4 @@
 "use strict";
-// import fetch from 'cross-fetch';
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -9,8 +8,12 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.fetchPage = void 0;
+const cross_fetch_1 = __importDefault(require("cross-fetch"));
 const USER_AGENTS = [
     'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/87.0.4280.88 Safari/537.36',
     'Mozilla/5.0 (iPhone; CPU iPhone OS 14_3 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) CriOS/87.0.4280.77 Mobile/15E148 Safari/604.1',
@@ -22,7 +25,7 @@ const headers = {
 };
 const fetchPage = (url) => __awaiter(void 0, void 0, void 0, function* () {
     try {
-        const response = yield fetch(url, { headers });
+        const response = yield (0, cross_fetch_1.default)(url, { headers });
         if (response.status >= 400 && response.status < 600) {
             throw new Error(`node-csfd-api: Bad response ${response.status} for url: ${url}`);
         }

package/cjs/helpers/search.helper.js

@@ -37,13 +37,24 @@ const getOrigins = (el) => {
 };
 exports.getOrigins = getOrigins;
 const parsePeople = (el, type) => {
-    const people = el.querySelectorAll(`.article-content .${type} a`);
-    return people.map((person) => {
-        return {
-            id: (0, global_helper_1.parseIdFromUrl)(person.attributes.href),
-            name: person.innerText.trim(),
-            url: `https://www.csfd.cz${person.attributes.href}`
-        };
-    });
+    let who;
+    if (type === 'directors')
+        who = 'Režie:';
+    if (type === 'actors')
+        who = 'Hrají:';
+    const peopleNode = Array.from(el && el.querySelectorAll('.article-content p')).find((el) => el.textContent.includes(who));
+    if (peopleNode) {
+        const people = Array.from(peopleNode.querySelectorAll('a'));
+        return people.map((person) => {
+            return {
+                id: (0, global_helper_1.parseIdFromUrl)(person.attributes.href),
+                name: person.innerText.trim(),
+                url: `https://www.csfd.cz${person.attributes.href}`
+            };
+        });
+    }
+    else {
+        return [];
+    }
 };
 exports.parsePeople = parsePeople;

package/cjs/services/search.service.js

@@ -24,12 +24,14 @@ class SearchScraper {
             const html = (0, node_html_parser_1.parse)(response);
             const moviesNode = html.querySelectorAll('.main-movies article');
             const usersNode = html.querySelectorAll('.main-users article');
-            return this.parseSearch(moviesNode, usersNode);
+            const tvSeriesNode = html.querySelectorAll('.main-series article');
+            return this.parseSearch(moviesNode, usersNode, tvSeriesNode);
         });
     }
-    parseSearch(moviesNode, usersNode) {
+    parseSearch(moviesNode, usersNode, tvSeriesNode) {
         const movies = [];
         const users = [];
+        const tvSeries = [];
         moviesNode.map((m) => {
             const url = (0, search_helper_1.getUrl)(m);
             const movie = {
@@ -42,7 +44,7 @@ class SearchScraper {
                 poster: (0, search_helper_1.getPoster)(m),
                 origins: (0, search_helper_1.getOrigins)(m),
                 creators: {
-                    directors: (0, search_helper_1.parsePeople)(m, 'director'),
+                    directors: (0, search_helper_1.parsePeople)(m, 'directors'),
                     actors: (0, search_helper_1.parsePeople)(m, 'actors')
                 }
             };
@@ -59,10 +61,28 @@ class SearchScraper {
             };
             users.push(user);
         });
+        tvSeriesNode.map((m) => {
+            const url = (0, search_helper_1.getUrl)(m);
+            const user = {
+                id: (0, global_helper_1.parseIdFromUrl)(url),
+                title: (0, search_helper_1.getTitle)(m),
+                year: (0, search_helper_1.getYear)(m),
+                url: `https://www.csfd.cz${url}`,
+                type: (0, search_helper_1.getType)(m),
+                colorRating: (0, search_helper_1.getColorRating)(m),
+                poster: (0, search_helper_1.getPoster)(m),
+                origins: (0, search_helper_1.getOrigins)(m),
+                creators: {
+                    directors: (0, search_helper_1.parsePeople)(m, 'directors'),
+                    actors: (0, search_helper_1.parsePeople)(m, 'actors')
+                }
+            };
+            tvSeries.push(user);
+        });
         const search = {
             movies: movies,
             users: users,
-            tvSeries: [],
+            tvSeries: tvSeries,
             creators: []
         };
         return search;

package/esm/fetchers/index.js

@@ -1,4 +1,3 @@
-// import fetch from 'cross-fetch';
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -8,6 +7,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+import fetch from 'cross-fetch';
 const USER_AGENTS = [
     'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/87.0.4280.88 Safari/537.36',
     'Mozilla/5.0 (iPhone; CPU iPhone OS 14_3 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) CriOS/87.0.4280.77 Mobile/15E148 Safari/604.1',

package/esm/helpers/search.helper.js

@@ -27,12 +27,23 @@ export const getOrigins = (el) => {
     return originsAll === null || originsAll === void 0 ? void 0 : originsAll.split('/').map((country) => country.trim());
 };
 export const parsePeople = (el, type) => {
-    const people = el.querySelectorAll(`.article-content .${type} a`);
-    return people.map((person) => {
-        return {
-            id: parseIdFromUrl(person.attributes.href),
-            name: person.innerText.trim(),
-            url: `https://www.csfd.cz${person.attributes.href}`
-        };
-    });
+    let who;
+    if (type === 'directors')
+        who = 'Režie:';
+    if (type === 'actors')
+        who = 'Hrají:';
+    const peopleNode = Array.from(el && el.querySelectorAll('.article-content p')).find((el) => el.textContent.includes(who));
+    if (peopleNode) {
+        const people = Array.from(peopleNode.querySelectorAll('a'));
+        return people.map((person) => {
+            return {
+                id: parseIdFromUrl(person.attributes.href),
+                name: person.innerText.trim(),
+                url: `https://www.csfd.cz${person.attributes.href}`
+            };
+        });
+    }
+    else {
+        return [];
+    }
 };

package/esm/services/search.service.js

@@ -21,12 +21,14 @@ export class SearchScraper {
             const html = parse(response);
             const moviesNode = html.querySelectorAll('.main-movies article');
             const usersNode = html.querySelectorAll('.main-users article');
-            return this.parseSearch(moviesNode, usersNode);
+            const tvSeriesNode = html.querySelectorAll('.main-series article');
+            return this.parseSearch(moviesNode, usersNode, tvSeriesNode);
         });
     }
-    parseSearch(moviesNode, usersNode) {
+    parseSearch(moviesNode, usersNode, tvSeriesNode) {
         const movies = [];
         const users = [];
+        const tvSeries = [];
         moviesNode.map((m) => {
             const url = getUrl(m);
             const movie = {
@@ -39,7 +41,7 @@ export class SearchScraper {
                 poster: getPoster(m),
                 origins: getOrigins(m),
                 creators: {
-                    directors: parsePeople(m, 'director'),
+                    directors: parsePeople(m, 'directors'),
                     actors: parsePeople(m, 'actors')
                 }
             };
@@ -56,10 +58,28 @@ export class SearchScraper {
             };
             users.push(user);
         });
+        tvSeriesNode.map((m) => {
+            const url = getUrl(m);
+            const user = {
+                id: parseIdFromUrl(url),
+                title: getTitle(m),
+                year: getYear(m),
+                url: `https://www.csfd.cz${url}`,
+                type: getType(m),
+                colorRating: getColorRating(m),
+                poster: getPoster(m),
+                origins: getOrigins(m),
+                creators: {
+                    directors: parsePeople(m, 'directors'),
+                    actors: parsePeople(m, 'actors')
+                }
+            };
+            tvSeries.push(user);
+        });
         const search = {
             movies: movies,
             users: users,
-            tvSeries: [],
+            tvSeries: tvSeries,
             creators: []
         };
         return search;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-csfd-api",
-  "version": "3.0.0-next.1",
+  "version": "3.0.0-next.3",
   "description": "ČSFD API in JavaScript. Amazing NPM library for scrapping csfd.cz :)",
   "main": "./cjs/index.js",
   "author": "BART! <bart@bartweb.cz>",
@@ -15,7 +15,7 @@
     "lint": "eslint ./src/**/**/* --fix",
     "test": "jest",
     "fix-paths": "yarn json -I -f ./dist/package.json -e \"this.module='./esm/index.js';this.main='./cjs/index.js';this.types='./types/index.d.ts'\"",
-    "publish:next": "yarn && yarn build && yarn test --coverage true && npm publish --folder dist --tag beta",
+    "publish:next": "yarn && yarn build && yarn test --coverage true && cd dist && npm publish --tag beta",
     "postversion": "git push && git push --follow-tags",
     "release:beta": "npm version preminor --preid=beta -m \"chore(update): prelease %s β\"",
     "prerelease:beta": "npm version prerelease --preid=beta -m \"chore(update): prelease %s β\"",
@@ -23,9 +23,13 @@
     "release:minor": "git checkout master && npm version minor -m \"chore(update): release %s 🚀\"",
     "release:major": "git checkout master && npm version major -m \"chore(update): major release %s 💥\""
   },
+  "publishConfig": {
+    "access": "public",
+    "registry": "https://registry.npmjs.org"
+  },
   "dependencies": {
     "cross-fetch": "^3.1.5",
-    "node-html-parser": "^6.1.1"
+    "node-html-parser": "^6.1.4"
   },
   "repository": {
     "url": "git+https://github.com/bartholomej/node-csfd-api.git",
@@ -49,7 +53,7 @@
     "api"
   ],
   "engines": {
-    "node": ">= 12"
+    "node": ">= 14"
   },
   "license": "MIT",
   "module": "./esm/index.js",

package/types/helpers/creator.helper.d.ts

@@ -3,15 +3,15 @@ import { CSFDCreatorScreening } from '../interfaces/creator.interface';
 import { CSFDColorRating } from '../interfaces/global';
 export declare const getColorRating: (el: HTMLElement) => CSFDColorRating;
 export declare const getId: (url: string) => number;
-export declare const getName: (el: HTMLElement) => string;
-export declare const getBirthdayInfo: (el: HTMLElement) => {
+export declare const getName: (el: HTMLElement | null) => string;
+export declare const getBirthdayInfo: (el: HTMLElement | null) => {
     birthday: string;
     age: number;
     birthPlace: string;
 };
-export declare const getBio: (el: HTMLElement) => string;
-export declare const getPhoto: (el: HTMLElement) => string;
+export declare const getBio: (el: HTMLElement | null) => string;
+export declare const getPhoto: (el: HTMLElement | null) => string;
 export declare const parseBirthday: (text: string) => any;
 export declare const parseAge: (text: string) => any;
 export declare const parseBirthPlace: (text: string) => any;
-export declare const getFilms: (el: HTMLElement) => CSFDCreatorScreening[];
+export declare const getFilms: (el: HTMLElement | null) => CSFDCreatorScreening[];

package/types/helpers/movie.helper.d.ts

@@ -11,14 +11,14 @@ export declare const getRatingCount: (el: HTMLElement) => number;
 export declare const getYear: (el: string) => number;
 export declare const getDuration: (jsonLdRaw: string, el: HTMLElement) => number;
 export declare const getTitlesOther: (el: HTMLElement) => CSFDTitlesOther[];
-export declare const getPoster: (el: HTMLElement) => string;
-export declare const getRandomPhoto: (el: HTMLElement) => string;
-export declare const getTrivia: (el: HTMLElement) => string[];
+export declare const getPoster: (el: HTMLElement | null) => string;
+export declare const getRandomPhoto: (el: HTMLElement | null) => string;
+export declare const getTrivia: (el: HTMLElement | null) => string[];
 export declare const getDescriptions: (el: HTMLElement) => string[];
 export declare const parsePeople: (el: HTMLElement) => CSFDCreator[];
 export declare const getGroup: (el: HTMLElement, group: CSFDCreatorGroups) => CSFDCreator[];
 export declare const getType: (el: HTMLElement) => string;
-export declare const getVods: (el: HTMLElement) => CSFDVod[];
+export declare const getVods: (el: HTMLElement | null) => CSFDVod[];
 export declare const getBoxContent: (el: HTMLElement, box: string) => HTMLElement;
 export declare const getBoxMovies: (el: HTMLElement, boxName: CSFDBoxContent) => CSFDMovieListItem[];
 export declare const getPremieres: (el: HTMLElement) => CSFDPremiere[];

package/types/helpers/search.helper.d.ts

@@ -8,4 +8,4 @@ export declare const getUrl: (el: HTMLElement) => string;
 export declare const getColorRating: (el: HTMLElement) => CSFDColorRating;
 export declare const getPoster: (el: HTMLElement) => string;
 export declare const getOrigins: (el: HTMLElement) => string[];
-export declare const parsePeople: (el: HTMLElement, type: 'director' | 'actors') => CSFDCreator[];
+export declare const parsePeople: (el: HTMLElement, type: 'directors' | 'actors') => CSFDCreator[];

package/types/interfaces/creator.interface.d.ts

@@ -9,4 +9,4 @@ export interface CSFDCreator {
     bio: string;
     films: CSFDCreatorScreening[];
 }
-export declare type CSFDCreatorScreening = Omit<CSFDScreening, 'url' | 'type'>;
+export type CSFDCreatorScreening = Omit<CSFDScreening, 'url' | 'type'>;

package/types/interfaces/global.d.ts

@@ -17,6 +17,6 @@ export interface CSFDScreening {
      */
     colorRating: CSFDColorRating;
 }
-export declare type CSFDColorRating = 'bad' | 'average' | 'good' | 'unknown';
-export declare type CSFDStars = 0 | 1 | 2 | 3 | 4 | 5;
-export declare type CSFDFilmTypes = 'film' | 'TV film' | 'pořad' | 'seriál' | 'divadelní záznam' | 'koncert' | 'série' | 'studentský film' | 'amatérský film' | 'hudební videoklip' | 'epizoda';
+export type CSFDColorRating = 'bad' | 'average' | 'good' | 'unknown';
+export type CSFDStars = 0 | 1 | 2 | 3 | 4 | 5;
+export type CSFDFilmTypes = 'film' | 'TV film' | 'pořad' | 'seriál' | 'divadelní záznam' | 'koncert' | 'série' | 'studentský film' | 'amatérský film' | 'hudební videoklip' | 'epizoda';

package/types/interfaces/movie.interface.d.ts

@@ -17,8 +17,9 @@ export interface CSFDMovie extends CSFDScreening {
     related: CSFDMovieListItem[];
     similar: CSFDMovieListItem[];
 }
+export type CSFDVodService = 'Netflix' | 'hbogo' | 'Prime Video' | 'Apple TV+' | 'iTunes' | 'KVIFF.TV' | 'Edisonline' | 'o2tv' | 'SledovaniTV' | 'Starmax' | 'DAFilms' | 'FILMY ČESKY A ZADARMO' | 'Youtube Česká filmová klasika' | 'VAPET' | 'VOREL FILM' | 'ivysilani' | 'Google Play' | 'Voyo' | 'DVD';
 export interface CSFDVod {
-    title: 'Netflix' | 'hbogo' | 'Prime Video' | 'Apple TV+' | 'iTunes' | 'Aerovod' | 'Edisonline' | 'o2tv' | 'SledovaniTV' | 'Starmax' | 'DAFilms' | 'FILMY ČESKY A ZADARMO' | 'Youtube Česká filmová klasika' | 'VAPET' | 'VOREL FILM' | 'ivysilani' | 'Google Play' | 'Voyo' | string;
+    title: CSFDVodService;
     url: string;
 }
 export interface CSFDCreators {
@@ -54,12 +55,12 @@ export interface CSFDMovieListItem {
     title: string;
     url: string;
 }
-export declare type CSFDGenres = 'Akční' | 'Animovaný' | 'Dobrodružný' | 'Dokumentární' | 'Drama' | 'Experimentální' | 'Fantasy' | 'Film-Noir' | 'Historický' | 'Horor' | 'Hudební' | 'IMAX' | 'Katastrofický' | 'Komedie' | 'Krátkometrážní' | 'Krimi' | 'Loutkový' | 'Muzikál' | 'Mysteriózní' | 'Naučný' | 'Podobenství' | 'Poetický' | 'Pohádka' | 'Povídkový' | 'Psychologický' | 'Publicistický' | 'Reality-TV' | 'Road movie' | 'Rodinný' | 'Romantický' | 'Sci-Fi' | 'Soutěžní' | 'Sportovní' | 'Stand-up' | 'Talk-show' | 'Taneční' | 'Telenovela' | 'Thriller' | 'Válečný' | 'Western' | 'Zábavný' | 'Životopisný';
-export declare type CSFDCreatorGroups = 'Režie' | 'Scénář' | 'Kamera' | 'Hudba' | 'Hrají' | 'Produkce' | 'Střih' | 'Předloha' | 'Scénografie' | 'Kostýmy';
+export type CSFDGenres = 'Akční' | 'Animovaný' | 'Dobrodružný' | 'Dokumentární' | 'Drama' | 'Experimentální' | 'Fantasy' | 'Film-Noir' | 'Historický' | 'Horor' | 'Hudební' | 'IMAX' | 'Katastrofický' | 'Komedie' | 'Krátkometrážní' | 'Krimi' | 'Loutkový' | 'Muzikál' | 'Mysteriózní' | 'Naučný' | 'Podobenství' | 'Poetický' | 'Pohádka' | 'Povídkový' | 'Psychologický' | 'Publicistický' | 'Reality-TV' | 'Road movie' | 'Rodinný' | 'Romantický' | 'Sci-Fi' | 'Soutěžní' | 'Sportovní' | 'Stand-up' | 'Talk-show' | 'Taneční' | 'Telenovela' | 'Thriller' | 'Válečný' | 'Western' | 'Zábavný' | 'Životopisný';
+export type CSFDCreatorGroups = 'Režie' | 'Scénář' | 'Kamera' | 'Hudba' | 'Hrají' | 'Produkce' | 'Střih' | 'Předloha' | 'Scénografie' | 'Kostýmy';
 export interface CSFDPremiere {
     country: string;
     format: string;
     date: string;
     company: string;
 }
-export declare type CSFDBoxContent = 'Související' | 'Podobné';
+export type CSFDBoxContent = 'Související' | 'Podobné';

package/types/interfaces/user-ratings.interface.d.ts

@@ -15,4 +15,4 @@ export interface CSFDUserRatingConfig {
      */
     allPagesDelay?: number;
 }
-export declare type Colors = 'lightgrey' | 'blue' | 'red' | 'grey';
+export type Colors = 'lightgrey' | 'blue' | 'red' | 'grey';