chore: Fix docker build

.dockerignore

@@ -1 +1,7 @@
-volume/
+node_modules
+volume/browser
+volume/db
+volume/downloads
+volume/errors
+
+.env

.gitignore

@@ -1,8 +1,8 @@
 node_modules
 volume/browser
-db
+volume/db
-downloads
+volume/downloads
-errors
+volume/errors
 dist
 
 # Web

Dockerfile

@@ -1,23 +1,17 @@
-# Use official Node.js image as base
+FROM node:22
-FROM node:18
 
-# Create app directory
 WORKDIR /usr/src/app
 
-# Copy package.json and package-lock.json (if available)
-COPY package*.json ./
-
-# Install dependencies
-RUN npm install
-
-# Build
-RUN npm run build
-
-# Copy app source code
 COPY . .
 
-# Expose the port your app runs on (optional, depends on your app)
+RUN npm ci
+
+RUN npm run build-noweb
+
+RUN npm prune --production
+
+COPY dist dist
+
 EXPOSE 3000
 
-# Start the app
+CMD ["npm", "run", "serve"]
-CMD ["npm", "start"]

docker-compose.yml

@@ -6,7 +6,8 @@ services:
     ports:
       - "3000:3000"
     environment:
-      NODE_ENV: development
+      NODE_ENV: production
+      EMAIL: username@spsejecna.cz
+      PASSWORD: mojesupertajneheslo
     volumes:
-      - ./volume:./usr/src/app/volume
+      - ./volume:/usr/src/app/volume
-    command: npm start

package.json

@@ -10,6 +10,7 @@
     "test": "tsx tests/test.ts",
     "start": "concurrently \"NODE_ENV=development tsx server.ts\" \"NODE_ENV=development tsx cron-runner.ts\"",
     "build": "tsc && cd web && hugo --gc --minify",
+    "build-noweb": "tsc",
     "serve": "concurrently \"node dist/server.js\" \"node dist/cron-runner.js\"",
     "dev-web": "cd web && hugo serve"
   },

scrape/parse.ts

@@ -15,7 +15,6 @@
 import parseV1V2 from "./parse/v1_v2.js";
 import parseV3 from "./parse/v3.js";
 
-
 export default async function parseThisShit(downloadedFilePath: string) {
   await parseV1V2(downloadedFilePath);
   await parseV3(downloadedFilePath);

scrape/parse/v1_v2.ts

@@ -253,7 +253,7 @@ export default async function parseV1V2(downloadedFilePath: string) {
     }
   }
 
-  fs.writeFileSync("db/v2.json", JSON.stringify(data, null, 2));
+  fs.writeFileSync("volume/db/v2.json", JSON.stringify(data, null, 2));
 
   // Modify the data for v1
   const copy = JSON.parse(JSON.stringify(data));
@@ -275,7 +275,7 @@ export default async function parseV1V2(downloadedFilePath: string) {
     });
   });
 
-  fs.writeFileSync("db/v1.json", JSON.stringify(copy, null, 2))
+  fs.writeFileSync("volume/db/v1.json", JSON.stringify(copy, null, 2))
 }
 
 //parseV1V2("db/current.xlsx")

scrape/parse/v3.ts

@@ -147,7 +147,7 @@ export default async function parseV3(downloadedFilePath: string) {
     schedule,
   };
 
-  fs.writeFileSync("db/v3.json", JSON.stringify(data, null, 2));
+  fs.writeFileSync("volume/db/v3.json", JSON.stringify(data, null, 2));
 }
 
 //
@@ -424,4 +424,4 @@ function formatNowTime() {
   );
 }
 
-parseV3("db/current.xlsx")
+//parseV3("db/current.xlsx")

scrape/scraper.ts

@@ -21,12 +21,16 @@ import 'dotenv/config';
 const EMAIL = process.env.EMAIL;
 const PASSWORD = process.env.PASSWORD;
 const SHAREPOINT_URL = process.env.SHAREPOINT_URL || 'https://spsejecnacz.sharepoint.com/:x:/s/nastenka/ESy19K245Y9BouR5ksciMvgBu3Pn_9EaT0fpP8R6MrkEmg';
-const VOLUME_PATH = path.resolve('./volume/browser');
+
+const VOLUME_PATH = path.resolve("./volume/browser");
+const DOWNLOAD_FOLDER = path.resolve("./volume/downloads");
+const ERROR_FOLDER = path.resolve("./volume/errors")
+const DB_FOLDER = path.resolve("./volume/db");
 
 async function clearDownloadsFolder() {
   try {
-    await fs.promises.rm('./downloads', { recursive: true, force: true });
+    await fs.promises.rm(DOWNLOAD_FOLDER, { recursive: true, force: true });
-    await fs.promises.mkdir('./downloads');
+    await fs.promises.mkdir(DOWNLOAD_FOLDER);
   } catch (err) {
     console.error('Error:', err);
   }
@@ -34,28 +38,27 @@ async function clearDownloadsFolder() {
 
 async function handleError(page: Page, err: any) {
   try {
-    const errorsDir = path.resolve('./errors');
+    if (!fs.existsSync(ERROR_FOLDER)) fs.mkdirSync(ERROR_FOLDER);
-    if (!fs.existsSync(errorsDir)) fs.mkdirSync(errorsDir);
 
     const timestamp = new Date().toISOString().replace(/[:.]/g, '-');
-    const filePath = path.join(errorsDir, `error-${timestamp}.png`);
+    const filePath = path.join(ERROR_FOLDER, `error-${timestamp}.png`);
 
     // @ts-ignore
     await page.screenshot({ path: filePath, fullPage: true });
     console.error(`❌ Error occurred. Screenshot saved: ${filePath}`);
 
     // Keep only last 10 screenshots
-    const files = fs.readdirSync(errorsDir)
+    const files = fs.readdirSync(ERROR_FOLDER)
       .map(f => ({
         name: f,
-        time: fs.statSync(path.join(errorsDir, f)).mtime.getTime()
+        time: fs.statSync(path.join(ERROR_FOLDER, f)).mtime.getTime()
       }))
       .sort((a, b) => b.time - a.time);
 
     if (files.length > 10) {
       const oldFiles = files.slice(10);
       for (const f of oldFiles) {
-        fs.unlinkSync(path.join(errorsDir, f.name));
+        fs.unlinkSync(path.join(ERROR_FOLDER, f.name));
       }
     }
   } catch (screenshotErr) {
@@ -75,13 +78,12 @@ async function handleError(page: Page, err: any) {
     const pages = await browser.pages();
     page = pages[0];
 
-    const downloadPath = path.resolve('./downloads');
+    if (!fs.existsSync(DOWNLOAD_FOLDER)) fs.mkdirSync(DOWNLOAD_FOLDER);
-    if (!fs.existsSync(downloadPath)) fs.mkdirSync(downloadPath);
 
     const client = await page.createCDPSession();
     await client.send('Page.setDownloadBehavior', {
       behavior: 'allow',
-      downloadPath: downloadPath,
+      downloadPath: DOWNLOAD_FOLDER,
     });
 
     await page.goto(SHAREPOINT_URL, { waitUntil: 'networkidle2' });
@@ -182,14 +184,16 @@ async function handleError(page: Page, err: any) {
       return files.length ? path.join(dir, files[0].name) : null;
     }
 
-    const downloadedFilePath = getNewestFile(downloadPath);
+    const downloadedFilePath = getNewestFile(DOWNLOAD_FOLDER);
     if (!downloadedFilePath) {
       throw new Error('No XLSX file found in download folder');
     }
     console.log('Waiting for file:', downloadedFilePath);
     await waitForFile(downloadedFilePath);
 
-    await fs.promises.cp(downloadedFilePath, "db/current.xlsx");
+    if (!fs.existsSync(DB_FOLDER)) fs.mkdirSync(DB_FOLDER);
+
+    await fs.promises.cp(downloadedFilePath, path.join(DB_FOLDER, "current.xlsx"));
 
     await parseThisShit(downloadedFilePath);
     await clearDownloadsFolder();

server.ts

@@ -20,6 +20,9 @@ import { getCurrentInterval } from "./scheduleRules.js";
 import bodyParser from "body-parser";
 import cors from "cors";
 
+const DB_FOLDER = path.join(process.cwd(), "volume", "db");
+const WEB_FOLDER = path.join(process.cwd(), "web", "public");
+
 const VERSIONS = ["v1", "v2", "v3"];
 const PORT = process.env.PORT || 3000;
 
@@ -39,9 +42,9 @@ app.get('/', async (req: Request, res: Response) => {
   const isBrowser = /Mozilla|Chrome|Firefox|Safari|Edg/.test(userAgent);
 
   if (isBrowser) {
-    res.sendFile(path.join(process.cwd(), "web", "public", "index.html"));
+    res.sendFile(path.join(WEB_FOLDER, "index.html"));
   } else {
-    const dataStr = await fs.readFile(path.join(process.cwd(), "db", "v1.json"), "utf8");
+    const dataStr = await fs.readFile(path.join(DB_FOLDER, "v1.json"), "utf8");
     const data = JSON.parse(dataStr);
 
     data["status"]["currentUpdateSchedule"] = getCurrentInterval();
@@ -51,7 +54,7 @@ app.get('/', async (req: Request, res: Response) => {
 });
 
 app.get('/versioned/v1', async (_: Request, res: Response) => {
-  const dataStr = await fs.readFile(path.join(process.cwd(), "db", "v1.json"), "utf8");
+  const dataStr = await fs.readFile(path.join(DB_FOLDER, "v1.json"), "utf8");
   const data = JSON.parse(dataStr);
 
   data["status"]["currentUpdateSchedule"] = getCurrentInterval();
@@ -62,7 +65,7 @@ app.get('/versioned/v1', async (_: Request, res: Response) => {
 VERSIONS.forEach((version) => {
   app.get(`/versioned/${version}`, async (_: Request, res: Response) => {
     try {
-      const filePath = path.join(process.cwd(), "db", `${version}.json`);
+      const filePath = path.join(DB_FOLDER, `${version}.json`);
       const dataStr = await fs.readFile(filePath, "utf8");
       const data = JSON.parse(dataStr);
 

tests/test.ts

@@ -16,6 +16,7 @@ import fs from "fs";
 import parseAbsence from "../scrape/utils/parseAbsence.js";
 
 const teachermap: Record<string, string> = JSON.parse(fs.readFileSync("./tests/teachermap.json", "utf8"));
+let passedAll = true;
 
 test("Me", [
   {
@@ -262,6 +263,7 @@ function test(input: string, expectedOutput: any[]) {
   const res = parseAbsence(input, teachermap);
 
   if (!deepEqual(res, expectedOutput)) {
+    passedAll = false;
     console.error("ERROR for input: " + input);
     console.log(JSON.stringify(res, null, 2));
     console.log(JSON.stringify(expectedOutput, null, 2));
@@ -308,3 +310,7 @@ function deepEqual(a: any, b: any): boolean {
 
   return keysA.every((key) => keysB.includes(key) && deepEqual(a[key], b[key]));
 }
+
+if (passedAll) {
+  console.log("All tests passed");
+}

web/content/posts/api/_index.md

@@ -0,0 +1,5 @@
+---
+title: API
+summary: Jak využívat API
+description: Jak využívat API
+---

web/content/posts/api/usage/index.md

@@ -18,19 +18,21 @@ Kořenový endpoint (`/`) je **zastaralý (deprecated)**.
 
 Ačkoliv v současnosti vrací stejná data jako `/versioned/v1`, jeho podpora může být v budoucnu ukončena. **Prosím, nepoužívejte tento endpoint pro nové projekty a existující projekty aktualizujte na verzované endpointy.**
 
+**Tento endpoint vrací V1 pouze pokud se nejedná o UserAgent prohlížeče. Pokud se detekuje prohlížeč, vrátí se webová stránka.**
+
 ---
 
 ## Dostupné Verze API
 
 API je verzované, aby byla zajištěna zpětná kompatibilita. Zde je seznam dostupných verzí:
 
-- ### [Verze 2 (v2)](../api-usage-v2)
+- ### [Verze 2 (v2)](../v2)
   **Status:** Stabilní
-  **Endpoint:** `/versioned/v1`
+  **Endpoint:** `/versioned/v2`
   
   Toto je aktuální a doporučená verze API. Klikněte na odkaz pro zobrazení kompletní dokumentace pro v2.
 
-- ### [Verze 1 (v1)](../api-usage-v1)
+- ### [Verze 1 (v1)](../v1)
   **Status:** Stabilní
   **Endpoint:** `/versioned/v1`
 

web/hugo.yaml

@@ -59,7 +59,7 @@ params:
     Content: >
       Webová stránka SPŠE Ječná Rozvrh API pro získávání mimořádného rozvrhu v rozumném formátu.
 
-      - **Toto API je NEOFICIÁLNǏ a nemá nic společného s oficiálním softwarem školy**.
+      - **Toto API je NEOFICIÁLNÍ a nemá nic společného s oficiálním softwarem školy**.
 
 
 markup: