Merge pull request #66 from bartholomej/fix/cache

Server: Make services stateless to eliminate shared state mutations

Author: bartholomej

.github/pull_request_template.md

@@ -1,19 +1,24 @@
-## What's new and why I made this pull request?
+## Description
 
--
+<!-- Briefly describe the changes and the motivation behind them. -->
 
-## Pull request type
+## Type of change
 
-What kind of change does this PR introduce?
+- [ ] Bug fix
+- [ ] New feature
+- [ ] Refactoring (no functional changes)
+- [ ] Code style update
+- [ ] Build / CI related changes
+- [ ] Documentation update
+- [ ] Tests
+- [ ] Other
 
-```
-[ ] Bugfix
-[ ] Feature
-[ ] Code style update (formatting, local variables)
-[ ] Refactoring (no functional changes, no api changes)
-[ ] Build related changes
-[ ] CI related changes
-[ ] Documentation content changes
-[ ] Tests
-[ ] Other
-```
+## Related Issues
+
+<!-- Closes #... -->
+
+## Checklist
+
+- [ ] I have performed a self-review of my code
+- [ ] My changes generate no new warnings
+- [ ] I have added tests that prove my fix is effective or that my feature works

package.json

@@ -4,7 +4,9 @@
   "description": "ČSFD API in JavaScript. Amazing NPM library for scrapping csfd.cz :)",
   "author": "BART! <[email protected]>",
   "scripts": {
-    "start": "tsc -w",
+    "dev": "tsc -w",
+    "start": "yarn dev",
+    "server": "tsx server",
     "prebuild": "rimraf dist",
     "build": "tsdown --config-loader unconfig && cp README.md dist/ && cp LICENSE dist/",
     "build:server": "npx esbuild ./server.ts --outfile=dist/server.mjs --format=esm --sourcemap && node scripts/server-mod.js",
@@ -50,7 +52,7 @@
     "eslint-config-google": "^0.14.0",
     "eslint-config-prettier": "^10.1.8",
     "eslint-plugin-prettier": "^5.5.4",
-    "express": "^5.1.0",
+    "express": "^5.2.0",
     "express-rate-limit": "^8.2.1",
     "express-slow-down": "^3.0.1",
     "globals": "^16.5.0",
@@ -59,7 +61,7 @@
     "prettier": "^3.7.3",
     "rimraf": "^6.1.2",
     "tsdown": "^0.15.11",
-    "tsx": "^4.20.6",
+    "tsx": "^4.21.0",
     "typescript": "^5.9.3",
     "vitest": "^4.0.14"
   },

src/services/cinema.service.ts

@@ -11,8 +11,6 @@ import {
 } from './../helpers/cinema.helper';
 
 export class CinemaScraper {
-  private cinema: CSFDCinema[];
-
   public async cinemas(
     district: number = 1,
     period: CSFDCinemaPeriod = 'today',
@@ -25,11 +23,10 @@ export class CinemaScraper {
 
     const contentNode = cinemasHtml.querySelectorAll('#snippet--cinemas section[id*="cinema-"]');
 
-    this.buildCinemas(contentNode);
-    return this.cinema;
+    return this.buildCinemas(contentNode);
   }
 
-  private buildCinemas(contentNode: HTMLElement[]) {
+  private buildCinemas(contentNode: HTMLElement[]): CSFDCinema[] {
     const cinemas: CSFDCinema[] = [];
 
     contentNode.forEach((x) => {
@@ -45,6 +42,6 @@ export class CinemaScraper {
       cinemas.push(cinema);
     });
 
-    this.cinema = cinemas;
+    return cinemas;
   }
 }

src/services/creator.service.ts

@@ -1,12 +1,16 @@
 import { HTMLElement, parse } from 'node-html-parser';
 import { CSFDCreator } from '../dto/creator';
 import { fetchPage } from '../fetchers';
-import { getCreatorBio, getCreatorBirthdayInfo, getCreatorFilms, getCreatorName, getCreatorPhoto } from '../helpers/creator.helper';
+import {
+  getCreatorBio,
+  getCreatorBirthdayInfo,
+  getCreatorFilms,
+  getCreatorName,
+  getCreatorPhoto
+} from '../helpers/creator.helper';
 import { creatorUrl } from '../vars';
 
 export class CreatorScraper {
-  private person: CSFDCreator;
-
   public async creator(creatorId: number, optionsRequest?: RequestInit): Promise<CSFDCreator> {
     const id = Number(creatorId);
     if (isNaN(id)) {
@@ -19,12 +23,11 @@ export class CreatorScraper {
 
     const asideNode = creatorHtml.querySelector('.creator-about');
     const filmsNode = creatorHtml.querySelector('.creator-filmography');
-    this.buildCreator(+creatorId, asideNode, filmsNode);
-    return this.person;
+    return this.buildCreator(+creatorId, asideNode, filmsNode);
   }
 
-  private buildCreator(id: number, asideEl: HTMLElement, filmsNode: HTMLElement) {
-    this.person = {
+  private buildCreator(id: number, asideEl: HTMLElement, filmsNode: HTMLElement): CSFDCreator {
+    return {
       id,
       name: getCreatorName(asideEl),
       birthday: getCreatorBirthdayInfo(asideEl)?.birthday,

src/services/movie.service.ts

@@ -26,8 +26,6 @@ import {
 import { movieUrl } from '../vars';
 
 export class MovieScraper {
-  private film: CSFDMovie;
-
   public async movie(movieId: number, optionsRequest?: RequestInit): Promise<CSFDMovie> {
     const id = Number(movieId);
     if (isNaN(id)) {
@@ -42,8 +40,7 @@ export class MovieScraper {
     const asideNode = movieHtml.querySelector('.aside-movie-profile');
     const movieNode = movieHtml.querySelector('.main-movie-profile');
     const jsonLd = movieHtml.querySelector('script[type="application/ld+json"]').innerText;
-    this.buildMovie(+movieId, movieNode, asideNode, pageClasses, jsonLd);
-    return this.film;
+    return this.buildMovie(+movieId, movieNode, asideNode, pageClasses, jsonLd);
   }
 
   private buildMovie(
@@ -52,8 +49,8 @@ export class MovieScraper {
     asideEl: HTMLElement,
     pageClasses: string[],
     jsonLd: string
-  ) {
-    this.film = {
+  ): CSFDMovie {
+    return {
       id: movieId,
       title: getMovieTitle(el),
       year: getMovieYear(jsonLd),

src/services/user-ratings.service.ts

@@ -16,8 +16,6 @@ import {
 import { userRatingsUrl } from '../vars';
 
 export class UserRatingsScraper {
-  private films: CSFDUserRatings[] = [];
-
   public async userRatings(
     user: string | number,
     config?: CSFDUserRatingConfig,
@@ -45,7 +43,7 @@ export class UserRatingsScraper {
 
         const items = parse(response);
         const movies = items.querySelectorAll('.box-user-rating .table-container tbody tr');
-        allMovies = [...this.getPage(config, movies)];
+        allMovies = [...allMovies, ...this.getPage(config, movies)];
 
         // Sleep
         if (config.allPagesDelay) {
@@ -59,6 +57,7 @@ export class UserRatingsScraper {
   }
 
   private getPage(config: CSFDUserRatingConfig, movies: HTMLElement[]) {
+    const films: CSFDUserRatings[] = [];
     if (config) {
       if (config.includesOnly?.length && config.excludes?.length) {
         console.warn(
@@ -76,23 +75,23 @@ export class UserRatingsScraper {
       // Filtering includesOnly
       if (config?.includesOnly?.length) {
         if (config.includesOnly.some((include) => type === include)) {
-          this.buildUserRatings(el);
+          films.push(this.buildUserRatings(el));
         }
         // Filter exludes
       } else if (config?.excludes?.length) {
         if (!config.excludes.some((exclude) => type === exclude)) {
-          this.buildUserRatings(el);
+          films.push(this.buildUserRatings(el));
         }
       } else {
         // Without filtering
-        this.buildUserRatings(el);
+        films.push(this.buildUserRatings(el));
       }
     }
-    return this.films;
+    return films;
   }
 
-  private buildUserRatings(el: HTMLElement) {
-    this.films.push({
+  private buildUserRatings(el: HTMLElement): CSFDUserRatings {
+    return {
       id: getUserRatingId(el),
       title: getUserRatingTitle(el),
       year: getUserRatingYear(el),
@@ -101,6 +100,6 @@ export class UserRatingsScraper {
       colorRating: getUserRatingColorRating(el) as CSFDColorRating,
       userDate: getUserRatingDate(el),
       userRating: getUserRating(el) as CSFDStars
-    });
+    };
   }
 }