node-csfd-api 3.0.0-next.0 → 3.0.0-next.2

package/README.md

@@ -340,7 +340,7 @@ _Note: You can not use both parameters 'includesOnly' and 'excludes'. Parameter
 
 - [Dafilms web extension](https://chrome.google.com/webstore/detail/dafilms/hgcgneddmgflnbmhkjnefiobjgobbmdm?hl=en) ([code](https://github.com/bartholomej/dafilms-ext)) – Parser for film ratings (web extension)
 - [bartweb.cz](https://bartweb.cz) – **Last seen** section (Firebase function)
-- KinoKlub – Mobile application for Aerofilms (native Adnroid + iOS application)
+- KinoKlub – Mobile application for AeroFilms (native Android + iOS application)
 
 ## Roadmap
 
@@ -439,7 +439,7 @@ I DO NOT STORE ANY DATA. PERIOD.
 
 I physically can't. I have nowhere to store it. I don't even have a server database to store it. So even if Justin Bieber asked nicely to see your data, I wouldn't have anything to show him.
 
-That's why, with CSFD Api, what happens on your device stays on your device till disappear.
+That's why, with node-csfd-api, what happens on your device stays on your device till disappear.
 
 ## License
 

package/cjs/fetchers/index.js

@@ -1,4 +1,5 @@
 "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) {
@@ -8,12 +9,8 @@ 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',
@@ -25,7 +22,7 @@ const headers = {
 };
 const fetchPage = (url) => __awaiter(void 0, void 0, void 0, function* () {
     try {
-        const response = yield (0, cross_fetch_1.default)(url, { headers });
+        const response = yield fetch(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/creator.helper.js

@@ -56,7 +56,8 @@ const parseBirthPlace = (text) => {
 };
 exports.parseBirthPlace = parseBirthPlace;
 const getFilms = (el) => {
-    const filmNodes = el.querySelectorAll('.box:first-of-type table tr');
+    var _a;
+    const filmNodes = (_a = el.querySelectorAll('.box')[0]) === null || _a === void 0 ? void 0 : _a.querySelectorAll('table tr');
     let yearCache;
     const films = filmNodes.map((filmNode) => {
         var _a, _b, _c;

package/cjs/helpers/movie.helper.js

@@ -223,17 +223,20 @@ const getBoxMovies = (el, boxName) => {
 };
 exports.getBoxMovies = getBoxMovies;
 const getPremieres = (el) => {
-    var _a;
-    const premieresNode = el.querySelectorAll('.box-premieres li');
+    var _a, _b;
+    const premiereNodes = el.querySelectorAll('.box-premieres li');
     const premiere = [];
-    for (const premiereNode of premieresNode) {
-        const [date, ...company] = premiereNode.querySelector('p + span').attributes.title.split(' ');
-        premiere.push({
-            country: ((_a = premiereNode.querySelector('.flag')) === null || _a === void 0 ? void 0 : _a.attributes.title) || null,
-            format: premiereNode.querySelector('p').textContent.trim().split(' od')[0],
-            date,
-            company: company.join(' ')
-        });
+    for (const premiereNode of premiereNodes) {
+        const title = premiereNode.querySelector('p + span').attributes.title;
+        if (title) {
+            const [date, ...company] = title === null || title === void 0 ? void 0 : title.split(' ');
+            premiere.push({
+                country: ((_a = premiereNode.querySelector('.flag')) === null || _a === void 0 ? void 0 : _a.attributes.title) || null,
+                format: (_b = premiereNode.querySelector('p').textContent.trim()) === null || _b === void 0 ? void 0 : _b.split(' od')[0],
+                date,
+                company: company.join(' ')
+            });
+        }
     }
     return premiere;
 };

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

@@ -42,7 +42,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')
                 }
             };

package/esm/fetchers/index.js

@@ -1,3 +1,4 @@
+// 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) {
@@ -7,7 +8,6 @@ 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/creator.helper.js

@@ -44,7 +44,8 @@ export const parseBirthPlace = (text) => {
     return text.trim().replace(/<br>/g, '').trim();
 };
 export const getFilms = (el) => {
-    const filmNodes = el.querySelectorAll('.box:first-of-type table tr');
+    var _a;
+    const filmNodes = (_a = el.querySelectorAll('.box')[0]) === null || _a === void 0 ? void 0 : _a.querySelectorAll('table tr');
     let yearCache;
     const films = filmNodes.map((filmNode) => {
         var _a, _b, _c;

package/esm/helpers/movie.helper.js

@@ -200,17 +200,20 @@ export const getBoxMovies = (el, boxName) => {
     return movieListItem;
 };
 export const getPremieres = (el) => {
-    var _a;
-    const premieresNode = el.querySelectorAll('.box-premieres li');
+    var _a, _b;
+    const premiereNodes = el.querySelectorAll('.box-premieres li');
     const premiere = [];
-    for (const premiereNode of premieresNode) {
-        const [date, ...company] = premiereNode.querySelector('p + span').attributes.title.split(' ');
-        premiere.push({
-            country: ((_a = premiereNode.querySelector('.flag')) === null || _a === void 0 ? void 0 : _a.attributes.title) || null,
-            format: premiereNode.querySelector('p').textContent.trim().split(' od')[0],
-            date,
-            company: company.join(' ')
-        });
+    for (const premiereNode of premiereNodes) {
+        const title = premiereNode.querySelector('p + span').attributes.title;
+        if (title) {
+            const [date, ...company] = title === null || title === void 0 ? void 0 : title.split(' ');
+            premiere.push({
+                country: ((_a = premiereNode.querySelector('.flag')) === null || _a === void 0 ? void 0 : _a.attributes.title) || null,
+                format: (_b = premiereNode.querySelector('p').textContent.trim()) === null || _b === void 0 ? void 0 : _b.split(' od')[0],
+                date,
+                company: company.join(' ')
+            });
+        }
     }
     return premiere;
 };

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

@@ -39,7 +39,7 @@ export class SearchScraper {
                 poster: getPoster(m),
                 origins: getOrigins(m),
                 creators: {
-                    directors: parsePeople(m, 'director'),
+                    directors: parsePeople(m, 'directors'),
                     actors: parsePeople(m, 'actors')
                 }
             };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-csfd-api",
-  "version": "3.0.0-next.0",
+  "version": "3.0.0-next.2",
   "description": "ČSFD API in JavaScript. Amazing NPM library for scrapping csfd.cz :)",
   "main": "./cjs/index.js",
   "author": "BART! <bart@bartweb.cz>",
@@ -24,8 +24,7 @@
     "release:major": "git checkout master && npm version major -m \"chore(update): major release %s 💥\""
   },
   "dependencies": {
-    "cross-fetch": "^3.1.5",
-    "node-html-parser": "^5.3.3"
+    "node-html-parser": "^6.1.4"
   },
   "repository": {
     "url": "git+https://github.com/bartholomej/node-csfd-api.git",

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';