@lexho111/plainblog 0.5.11 → 0.5.12

package/Blog.js

@@ -5,16 +5,11 @@ import { URLSearchParams } from "url";
 import Article from "./Article.js";
 import DatabaseModel from "./model/DatabaseModel.js";
 import { fetchData, postData } from "./model/APIModel.js";
-import { formatHTML, header, formatMarkdown, validate } from "./Formatter.js";
-import pkg from "./package.json" with { type: "json" };
+import { formatHTML, header, formatMarkdown, validate } from "./Formatter.js"; // import pkg from "./package.json" with { type: "json" };
 import path from "path";
 import { fileURLToPath } from "url";
-import { exec } from "child_process";
-import { promisify } from "util";
 import { compileStyles, mergeStyles } from "./build-styles.js";
 
-const execPromise = promisify(exec); // x
-
 export default class Blog {
   constructor() {
     this.database = {
@@ -22,7 +17,7 @@ export default class Blog {
       username: "user",
       password: "password",
       host: "localhost",
-      dbname: "blog.json", // x
+      dbname: "articles.txt", // x
     };
     this.#title = "";
     this.#articles = [];
@@ -35,26 +30,31 @@ export default class Blog {
     this.reloadStylesOnGET = false;
     this.sessions = new Set();
 
-    this.#version = pkg.version;
+    this.#version = "0.0.1"; //pkg.version;
     console.log(`version: ${this.#version}`);
   }
 
+  /** @returns a json representation of the blog */
   json() {
-    const serverInfo = this.#server ? {
-      listening: this.#server.listening,
-      address: this.#server.address()
-    } : null;
-
-    const json = { 
-      "version": this.#version, 
-      "title": this.#title,
-      "articles": this.#articles,
-      "server": serverInfo,
-      "compiledStyles": this.compiledStyles,
-      "sessions": this.sessions,
-      "database": this.database,
-      "password": this.#password, "styles": this.#styles, "reloadStylesOnGET": this.reloadStylesOnGET 
-      }
+    const serverInfo = this.#server
+      ? {
+          listening: this.#server.listening,
+          address: this.#server.address(),
+        }
+      : null;
+
+    const json = {
+      version: this.#version,
+      title: this.#title,
+      articles: this.#articles,
+      server: serverInfo,
+      compiledStyles: this.compiledStyles,
+      sessions: this.sessions,
+      database: this.database,
+      password: this.#password,
+      styles: this.#styles,
+      reloadStylesOnGET: this.reloadStylesOnGET,
+    };
 
     return JSON.parse(JSON.stringify(json));
   }
@@ -70,7 +70,7 @@ export default class Blog {
   #articles = [];
   #styles = "";
   #stylesHash = "";
-  #scriptsHash = "";
+  //#scriptsHash = "";
   #stylesheetPath = "";
 
   setTitle(title) {
@@ -91,7 +91,7 @@ export default class Blog {
       this.#databaseModel = new DatabaseModel(this.database);
     }
     console.log(`connected to database`);
-    if(t != this.#title && t.length == 0)
+    if (t != this.#title && t.length == 0)
       this.#databaseModel.updateBlogTitle(t);
   }
 
@@ -103,6 +103,10 @@ export default class Blog {
     this.#password = x;
   }
 
+  /**
+   * allows you to inject a specific database implementation
+   * @param {*} adapter a database adapter like PostgresAdapter or SqliteAdapter
+   */
   setDatabaseAdapter(adapter) {
     if (!this.#databaseModel) {
       this.#databaseModel = new DatabaseModel(this.database);
@@ -110,13 +114,21 @@ export default class Blog {
     this.#databaseModel.setDatabaseAdapter(adapter);
   }
 
+  /**
+   * Appends CSS rules to the \<style\>-tag.
+   * @param {string} style - A string containing CSS rules.
+   */
   set style(style) {
     this.#styles += style;
   }
 
+  /**
+   * Sets the path(s) to custom CSS or SCSS files to be compiled and used by the blog.
+   * @param {string|string[]} files - A single file path or an array of file paths.
+   */
   set stylesheetPath(files) {
     this.#stylesheetPath = files;
-    console.log(`this.#stylesheetPath: ${this.#stylesheetPath}`)
+    console.log(`this.#stylesheetPath: ${this.#stylesheetPath}`);
   }
 
   addArticle(article) {
@@ -124,11 +136,11 @@ export default class Blog {
   }
 
   #isAuthenticated(req) {
-      if (!req.headers.cookie) return false;
-      const params = new URLSearchParams(req.headers.cookie.replace(/; /g, "&"));
-      return this.sessions.has(params.get("session"));
+    if (!req.headers.cookie) return false;
+    const params = new URLSearchParams(req.headers.cookie.replace(/; /g, "&"));
+    return this.sessions.has(params.get("session"));
   }
-  
+
   async #handleLogin(req, res) {
     const body = await new Promise((resolve, reject) => {
       let data = "";
@@ -154,12 +166,14 @@ export default class Blog {
 <input type="password" name="password" placeholder="Password" />
 <button style="margin: 2px;">Login</button></form>
 </body></html>`);
-      }
+    }
   }
-  
+
   #handleLogout(req, res) {
     if (req.headers.cookie) {
-      const params = new URLSearchParams(req.headers.cookie.replace(/; /g, "&"));
+      const params = new URLSearchParams(
+        req.headers.cookie.replace(/; /g, "&")
+      );
       const sessionId = params.get("session");
       if (this.sessions.has(sessionId)) {
         this.sessions.delete(sessionId);
@@ -177,16 +191,16 @@ export default class Blog {
     //this.loadStyles();
     //this.loadScripts();
     // if there is a stylesheet path provided, process it
-    if(this.#stylesheetPath != null) {
+    if (this.#stylesheetPath != null) {
       // read file from stylesheet path, compare checksums and write to public/styles.min.css
       await this.#processStylesheets(this.#stylesheetPath);
     }
-    if(!this.#stylesheetPath) { 
+    if (!this.#stylesheetPath) {
       // this.#styles
       // src/styles.css
       // compile and merge hardcoded styles in "this.#styles" with "src/styles.css" and write to file "styles.min.css"
       // which will be imported by webbrowser via '<link rel="stylesheet" href="styles.min.css"...'
-      
+
       const __filename = fileURLToPath(import.meta.url);
       const __dirname = path.dirname(__filename);
       const srcStylePath = path.join(__dirname, "src", "styles.css");
@@ -196,24 +210,38 @@ export default class Blog {
       let srcStyles = "";
 
       await Promise.all([
-        fs.promises.readFile(publicStylePath, "utf8").then((publicCSS) => {
-          const match = publicCSS.match(/\/\* source-hash: ([a-f0-9]{64}) \*\//);
-          if (match) publicHash = match[1];
-        }).catch((err) => console.error(err)), // public/styles.min.css doesn't exist, will be created.
-        fs.promises.readFile(srcStylePath, "utf8").then((content) => {
-          srcStyles = content;
-        }).catch((err) => console.error(err)) // ignore if src/styles.css doesn't exist
+        fs.promises
+          .readFile(publicStylePath, "utf8")
+          .then((publicCSS) => {
+            const match = publicCSS.match(
+              /\/\* source-hash: ([a-f0-9]{64}) \*\//
+            );
+            if (match) publicHash = match[1];
+          })
+          .catch((err) => console.error(err)), // public/styles.min.css doesn't exist, will be created.
+        fs.promises
+          .readFile(srcStylePath, "utf8")
+          .then((content) => {
+            srcStyles = content;
+          })
+          .catch((err) => console.error(err)), // ignore if src/styles.css doesn't exist
       ]);
 
       const combinedStyles = this.#styles + srcStyles;
-      const srcHash = crypto.createHash("sha256").update(combinedStyles).digest("hex");
+      const srcHash = crypto
+        .createHash("sha256")
+        .update(combinedStyles)
+        .digest("hex");
 
       if (srcHash !== publicHash) {
         console.log("Styles have changed. Recompiling...");
         const finalStyles = await mergeStyles(this.#styles, srcStyles);
         try {
           //await fs.promises.mkdir(path.dirname(publicStylePath), { recursive: true });
-          await fs.promises.writeFile(publicStylePath, finalStyles + `\n/* source-hash: ${srcHash} */`);
+          await fs.promises.writeFile(
+            publicStylePath,
+            finalStyles + `\n/* source-hash: ${srcHash} */`
+          );
         } catch (err) {
           console.error("Failed to write styles to public folder:", err);
         }
@@ -234,13 +262,27 @@ export default class Blog {
         this.#databaseModel.findAll(),
       ]);
 
-      if(dbArticles.length == 0) {
-        dbArticles.push(new Article("Sample Entry #1", "Prow scuttle parrel provost Sail ho shrouds spirits boom mizzenmast yardarm. Pinnace holystone mizzenmast quarter crow's nest nipperkin grog yardarm hempen halter furl. Swab barque interloper chantey doubloon starboard grog black jack gangway rutters.", new Date()));
-        dbArticles.push(new Article("Sample Entry #2", "Deadlights jack lad schooner scallywag dance the hempen jig carouser broadside cable strike colors. Bring a spring upon her cable holystone blow the man down spanker Shiver me timbers to go on account lookout wherry doubloon chase. Belay yo-ho-ho keelhaul squiffy black spot yardarm spyglass sheet transom heave to.", new Date())); 
+      if (dbArticles.length == 0) {
+        dbArticles.push(
+          new Article(
+            "Sample Entry #1",
+            "Prow scuttle parrel provost Sail ho shrouds spirits boom mizzenmast yardarm. Pinnace holystone mizzenmast quarter crow's nest nipperkin grog yardarm hempen halter furl. Swab barque interloper chantey doubloon starboard grog black jack gangway rutters.",
+            new Date()
+          )
+        );
+        dbArticles.push(
+          new Article(
+            "Sample Entry #2",
+            "Deadlights jack lad schooner scallywag dance the hempen jig carouser broadside cable strike colors. Bring a spring upon her cable holystone blow the man down spanker Shiver me timbers to go on account lookout wherry doubloon chase. Belay yo-ho-ho keelhaul squiffy black spot yardarm spyglass sheet transom heave to.",
+            new Date()
+          )
+        );
       }
-      if(this.reloadStylesOnGET) console.log("reload scripts and styles on GET-Request");
+      if (this.reloadStylesOnGET)
+        console.log("reload scripts and styles on GET-Request");
       let title = "";
-      if (this.#title != null && this.#title.length > 0) title = this.#title; // use blog title if set
+      if (this.#title != null && this.#title.length > 0)
+        title = this.#title; // use blog title if set
       else title = dbTitle; // use title from the database
       const responseData = { title: title, articles: dbArticles };
       this.#applyBlogData(responseData);
@@ -266,8 +308,10 @@ export default class Blog {
       try {
         // Save the new article to the database via the ApiServer
         const promises = [];
-        if (this.#databaseModel) promises.push(this.#databaseModel.save(newArticleData));
-        if (this.#isExternalAPI) promises.push(postData(this.#apiUrl, newArticleData));
+        if (this.#databaseModel)
+          promises.push(this.#databaseModel.save(newArticleData));
+        if (this.#isExternalAPI)
+          promises.push(postData(this.#apiUrl, newArticleData));
         await Promise.all(promises);
         // Add the article to the local list for immediate display
         this.#articles.unshift(new Article(title, content, new Date()));
@@ -331,14 +375,14 @@ export default class Blog {
         // load articles
 
         // reload styles and scripts on (every) request
-        if(this.reloadStylesOnGET) {
+        if (this.reloadStylesOnGET) {
           if (this.#stylesheetPath) {
             await this.#processStylesheets(this.#stylesheetPath);
           }
         }
 
         let loggedin = false;
-        if (!this.#isAuthenticated(req)) { 
+        if (!this.#isAuthenticated(req)) {
           // login
           loggedin = false;
         } else {
@@ -361,7 +405,10 @@ export default class Blog {
           const __filename = fileURLToPath(import.meta.url);
           const __dirname = path.dirname(__filename);
           const publicDir = path.join(__dirname, "public");
-          const parsedUrl = new URL(req.url, `http://${req.headers.host || "localhost"}`);
+          const parsedUrl = new URL(
+            req.url,
+            `http://${req.headers.host || "localhost"}`
+          );
           const filePath = path.join(publicDir, parsedUrl.pathname);
 
           if (filePath.startsWith(publicDir)) {
@@ -386,6 +433,7 @@ export default class Blog {
             }
           }
         } catch (err) {
+          console.error(err);
           // Continue to 404
         }
 
@@ -400,7 +448,7 @@ export default class Blog {
     return new Promise((resolve, reject) => {
       const errorHandler = (err) => reject(err);
       this.#server.once("error", errorHandler);
-      this.#server.listen(port, '127.0.0.1', () => {
+      this.#server.listen(port, "127.0.0.1", () => {
         this.#server.removeListener("error", errorHandler);
         console.log(`server running at http://localhost:${port}/`);
         resolve(); // Resolve the promise when the server is listening
@@ -411,12 +459,14 @@ export default class Blog {
   async closeServer() {
     return new Promise((resolve, reject) => {
       if (this.#server) {
+        // if server is running
         this.#server.close((err) => {
           if (err && err.code !== "ERR_SERVER_NOT_RUNNING") return reject(err);
           console.log("Server closed.");
           resolve();
         });
       } else {
+        // server is not running
         resolve(); // Nothing to close
       }
     });
@@ -429,7 +479,11 @@ export default class Blog {
     // Assuming data contains a title and an array of articles with title and content
     if (data.articles && Array.isArray(data.articles)) {
       for (const articleData of data.articles) {
-        const article = new Article(articleData.title, articleData.content, articleData.createdAt);
+        const article = new Article(
+          articleData.title,
+          articleData.content,
+          articleData.createdAt
+        );
         article.id = articleData.id; // TODO x
         this.addArticle(article);
       }
@@ -449,34 +503,39 @@ export default class Blog {
     const url = new URL(req.url, `http://${req.headers.host || "localhost"}`);
     const pathname = url.pathname;
 
-    if(req.method === "GET") {
-    if(pathname === "/api" || pathname === "/api/") {
-      res.writeHead(200, { "Content-Type": "application/json" });
-      const data = {
-        title: this.title
+    if (req.method === "GET") {
+      if (pathname === "/api" || pathname === "/api/") {
+        res.writeHead(200, { "Content-Type": "application/json" });
+        const data = {
+          title: this.title,
+        };
+        res.end(JSON.stringify(data));
+      }
+      // GET all blog data
+      if (pathname === "/api/articles") {
+        // Use 'offset' param as startId (filter) to get items starting at ID
+        const pStartID = parseInt(url.searchParams.get("startID"));
+        const startID = !isNaN(pStartID) ? pStartID : null;
+        const pEndID = parseInt(url.searchParams.get("endID"));
+        const endID = !isNaN(pEndID) ? pEndID : null;
+        const limit = parseInt(url.searchParams.get("limit")) || 10;
+        // controller
+        res.writeHead(200, { "Content-Type": "application/json" });
+        const dbArticles = await this.#databaseModel.findAll(
+          limit,
+          0,
+          startID,
+          endID
+        );
+        const responseData = {
+          title: this.title, // Keep the title from the original constant
+          articles: dbArticles,
+        };
+        res.end(JSON.stringify(responseData));
       }
-      res.end(JSON.stringify(data));
-    }
-    // GET all blog data
-    if (pathname === "/api/articles") {
-      // Use 'offset' param as startId (filter) to get items starting at ID
-      const pStartID = parseInt(url.searchParams.get("startID"));
-      const startID = !isNaN(pStartID) ? pStartID : null;
-      const pEndID = parseInt(url.searchParams.get("endID"));
-      const endID = !isNaN(pEndID) ? pEndID : null;
-      const limit = parseInt(url.searchParams.get("limit")) || 10;
-      // controller
-      res.writeHead(200, { "Content-Type": "application/json" });
-      const dbArticles = await this.#databaseModel.findAll(limit, 0, startID, endID);
-      const responseData = {
-        title: this.title, // Keep the title from the original constant
-        articles: dbArticles,
-      };
-      res.end(JSON.stringify(responseData));
-    }
 
-    // POST a new article
-  } else if (req.method === "POST" && pathname === "/api/articles") {
+      // POST a new article
+    } else if (req.method === "POST" && pathname === "/api/articles") {
       if (!this.#isAuthenticated(req)) {
         res.writeHead(403, { "Content-Type": "application/json" });
         res.end(JSON.stringify({ error: "Forbidden" }));
@@ -519,10 +578,10 @@ export default class Blog {
       title: this.title,
       articles: this.#articles,
       loggedin,
-      login: ""
+      login: "",
     };
 
-    if(loggedin) data.login = `<a href="/logout">logout</a>`;
+    if (loggedin) data.login = `<a href="/logout">logout</a>`;
     else data.login = `<a href="/login">login</a>`;
 
     const html = formatHTML(data);
@@ -535,14 +594,17 @@ export default class Blog {
    * @param {string[]} files - Array of css/scss file paths to process.
    */
   async #processStylesheets(files) {
-    console.log("process stylesheets")
-    
+    console.log("process stylesheets");
+
     // Normalize input to array (handles string or array)
     // "file1.css" --> ["file1.css"]
     // ["file1.css", "file2.css",...]
     const fileList = Array.isArray(files) ? files : [files];
     const styleFiles = fileList.filter(
-      (f) => typeof f === "string" && (f.endsWith(".scss") || f.endsWith(".css")) && !f.endsWith(".min.css")
+      (f) =>
+        typeof f === "string" &&
+        (f.endsWith(".scss") || f.endsWith(".css")) &&
+        !f.endsWith(".min.css")
     );
     //const scriptFiles = files.filter((f) => f.endsWith(".js") && !f.endsWith(".min.js"));
 
@@ -552,7 +614,7 @@ export default class Blog {
       const fileData = await Promise.all(
         styleFiles.sort().map(async (f) => {
           const content = await fs.promises.readFile(f, "utf-8");
-          if(content == "") throw new Error("Invalid Filepath or empty file!");
+          if (content == "") throw new Error("Invalid Filepath or empty file!");
           return { path: f, content };
         })
       );
@@ -573,7 +635,7 @@ export default class Blog {
       if (currentHash !== this.#stylesHash) {
         console.log("Style assets have changed. Recompiling...");
         this.#stylesHash = currentHash;
-        
+
         // Compile styles using the standalone script from build-styles.js
         this.compiledStyles = await compileStyles(fileData);
 
@@ -581,13 +643,13 @@ export default class Blog {
         const __filename = fileURLToPath(import.meta.url);
         const __dirname = path.dirname(__filename);
         const publicDir = path.join(__dirname, "public");
-        
+
         await fs.promises.writeFile(
           path.join(publicDir, "styles.min.css"),
           this.compiledStyles + `\n/* source-hash: ${currentHash} */`
         );
       } else {
-        console.log("styles are up-to-date")
+        console.log("styles are up-to-date");
       }
     }
   }

package/Formatter.js

@@ -1,3 +1,8 @@
+/**
+ * generates the header of the generated html file
+ * @param {*} title title of the blog
+ * @returns the header for the generated html file
+ */
 export function header(title) {
   return `<!DOCTYPE html>
 <html lang="de">
@@ -11,10 +16,12 @@ export function header(title) {
   </head>`;
 }
 
-/** format content to html */
+/**
+ * renders content like articles into a browser-ready HTML string.
+ * @param {*} data blog data like blogtitle, articles, login information
+ * @returns valid html code with article data implanted
+ */
 export function formatHTML(data) {
-  //console.log(`${data} ${script} ${style}`);
-  //export function formatHTML(data) {
   //const button = `<button type="button" onClick="fillWithContent();" style="margin: 4px;">generate random text</button>`;
   const button = "";
   let form1 = "";
@@ -59,6 +66,11 @@ export function formatHTML(data) {
 </html>`;
 }
 
+/**
+ * format content like articles to markdown
+ * @param {*} data blog data like blogtitle and articles
+ * @returns valid markdown
+ */
 export function formatMarkdown(data) {
   let markdown = "";
   markdown += `# ${data.title}\n`;
@@ -70,6 +82,11 @@ export function formatMarkdown(data) {
   return markdown;
 }
 
+/**
+ * html validator
+ * @param {*} html
+ * @returns true if param html is valid html
+ */
 export function validate(html) {
   let test = true; // all tests passed
   if (!(html.includes("<html") && html.includes("</html"))) {

package/build-styles.js

@@ -1,37 +1,35 @@
 import path from "path";
-import { pathToFileURL } from "url";
 import postcss from "postcss";
 import autoprefixer from "autoprefixer";
 import cssnano from "cssnano";
 
-// array of files or a single file
+/**
+ * Compiles CSS styles from file content objects.
+ * @param {Array<{path: string, content: string}>} fileData - An array of objects containing file paths and content.
+ * @returns {Promise<string>} The compiled and minified CSS.
+ */
 export async function compileStyles(fileData) {
   try {
     let combinedCss = "";
 
+    // 1. filter out css files
     if (fileData) {
       const scssFiles = fileData.filter(
         (f) =>
           f.path.endsWith(".scss") && !path.basename(f.path).startsWith("_")
       );
+      if (scssFiles.length > 0) console.error("sass files are not supported.");
 
-      for (const file of scssFiles) {
-        console.error("sass files are not supported.");
-      }
-
+      // make one big css file
       const cssFiles = fileData.filter((f) => f.path.endsWith(".css"));
       for (const file of cssFiles) {
         combinedCss += file.content + "\n";
       }
     }
 
-    // 2. PostCSS (Autoprefixer + CSSNano)
+    // 2. minify and uglify with PostCSS
     if (combinedCss) {
-      const plugins = [autoprefixer(), cssnano()];
-      const result = await postcss(plugins).process(combinedCss, {
-        from: undefined,
-      });
-      return result.css;
+      return postcss2(combinedCss);
     }
     return "";
   } catch (error) {
@@ -40,16 +38,25 @@ export async function compileStyles(fileData) {
   }
 }
 
+async function postcss2(css) {
+  const plugins = [autoprefixer(), cssnano()];
+  const result = await postcss(plugins).process(css, {
+    from: undefined, // do not print source map warning
+  });
+  return result.css; // final result
+}
+
+/**
+ * Merges and minifies multiple CSS content strings.
+ * @param {...string} cssContents - CSS strings to merge.
+ * @returns {Promise<string>} The merged and minified CSS.
+ */
 export async function mergeStyles(...cssContents) {
   try {
     const combinedCss = cssContents.join("\n");
 
     if (combinedCss) {
-      const plugins = [autoprefixer(), cssnano()];
-      const result = await postcss(plugins).process(combinedCss, {
-        from: undefined,
-      });
-      return result.css;
+      return postcss2(combinedCss);
     }
     return "";
   } catch (error) {

package/eslint.config.js

@@ -1,45 +1,27 @@
-import globals from "globals";
-import pluginJs from "@eslint/js";
-import pluginJest from "eslint-plugin-jest";
-
-export default [
-  {
-    // Configuration for all JavaScript files
-    files: ["**/*.js"],
-    languageOptions: {
-      ecmaVersion: 2022, // Supports modern JavaScript features
-      sourceType: "module",
-      globals: {
-        ...globals.node, // Defines Node.js global variables (e.g., `process`, `require`)
-      },
-    },
-    // ESLint's recommended rules for general JavaScript
-    rules: {
-      ...pluginJs.configs.recommended.rules,
-      // Add or override general JavaScript rules here.
-      // Example: Enforce semicolons at the end of statements
-      semi: ["error", "always"],
-      // Example: Prefer `const` over `let` where variables are not reassigned
-      "prefer-const": "error",
-      // Example: Prevent unused variables (can be configured further)
-      "no-unused-vars": ["warn", { args: "none" }],
-    },
-  },
-  {
-    // Configuration specifically for Jest test files
-    files: ["**/*.test.js", "**/*.spec.js"],
-    languageOptions: {
-      globals: {
-        ...globals.jest, // Defines Jest global variables (e.g., `describe`, `it`, `expect`)
-      },
-    },
-    plugins: {
-      jest: pluginJest,
-    },
-    // Recommended Jest rules from `eslint-plugin-jest`
-    rules: {
-      ...pluginJest.configs.recommended.rules,
-      // Add or override Jest-specific rules here.
-    },
-  },
-];
+import js from "@eslint/js";
+import globals from "globals";
+import { defineConfig } from "eslint/config";
+import pluginJest from "eslint-plugin-jest";
+
+export default defineConfig([
+  {
+    // Must be in a separate object to apply globally
+    ignores: ["public/scripts.min.js", "dist/**/*"],
+  },
+  {
+    files: ["**/*.{js,mjs,cjs}"],
+    plugins: { js },
+    extends: ["js/recommended"],
+    languageOptions: { globals: globals.browser },
+  },
+  {
+    files: ["**/*.test.js", "**/*.spec.js"],
+    plugins: { jest: pluginJest },
+    languageOptions: {
+      globals: pluginJest.environments.globals.globals, // Loads all Jest globals
+    },
+    rules: {
+      ...pluginJest.configs["flat/recommended"].rules,
+    },
+  },
+]);

package/knip.json

@@ -0,0 +1,10 @@
+{
+  "$schema": "https://unpkg.com/knip@5/schema.json",
+  "ignoreExportsUsedInFile": {
+    "interface": true,
+    "type": true
+  },
+  "tags": [
+    "-lintignore"
+  ]
+}

package/model/FileAdapter.js

@@ -8,9 +8,9 @@ import {
 
 export default class FileAdapter {
   dbtype = "file";
-  constructor(options) {
-    this.infoFile = "bloginfo.json";
-    this.articlesFile = "articles.txt";
+  constructor(options = {}) {
+    this.infoFile = options.infoFilename || "bloginfo.json";
+    this.articlesFile = options.articlesFilename || "articles.txt";
   }
 
   async initialize() {
@@ -41,8 +41,8 @@ export default class FileAdapter {
   async findAll(
     limit = 4,
     offset = 0,
-    startId = null,
-    endId = null,
+    //startId = null,
+    //endId = null,
     order = "DESC"
   ) {
     let dbArticles = [];

package/model/FileModel.js

@@ -11,6 +11,7 @@ export async function loadInfo(filename) {
     const data = await fs.readFile(filename, "utf8");
     return JSON.parse(data);
   } catch (err) {
+    console.error(err);
     return { title: "Blog" };
   }
 }
@@ -29,6 +30,7 @@ export async function loadArticles(filename) {
       .filter((line) => line.trim() !== "")
       .map((line) => JSON.parse(line));
   } catch (err) {
+    console.error(err);
     return [];
   }
 }
@@ -38,12 +40,14 @@ export async function initFiles(infoFilename, articlesFilename) {
   try {
     await fs.access(infoFilename);
   } catch (err) {
+    console.error(err);
     await saveInfo(infoFilename, { title: "Blog" });
   }
 
   try {
     await fs.access(articlesFilename);
   } catch (err) {
+    console.error(err);
     await fs.writeFile(articlesFilename, "");
   }
 }

package/model/PostgresAdapter.js

@@ -1,4 +1,3 @@
-import { Sequelize, DataTypes, Op } from "sequelize";
 import SequelizeAdapter from "./SequelizeAdapter.js";
 
 export default class PostgresAdapter extends SequelizeAdapter {
@@ -22,6 +21,7 @@ export default class PostgresAdapter extends SequelizeAdapter {
 
   async initialize() {
     console.log("initialize database");
+    await this.loadSequelize();
     const maxRetries = 10;
     const retryDelay = 3000;
 
@@ -31,7 +31,7 @@ export default class PostgresAdapter extends SequelizeAdapter {
           `postgres://${this.username}:${this.password}@${this.host}:${this.dbport}/${this.dbname}`
         );
 
-        this.sequelize = new Sequelize(
+        this.sequelize = new this.Sequelize(
           `postgres://${this.username}:${this.password}@${this.host}:${this.dbport}/${this.dbname}`,
           { logging: false }
         );

package/model/SequelizeAdapter.js

@@ -1,5 +1,3 @@
-import { Sequelize, DataTypes, Op } from "sequelize";
-
 export default class SequelizeAdapter {
   username;
   password;
@@ -11,38 +9,44 @@ export default class SequelizeAdapter {
   Article;
   BlogInfo;
 
+  // Dynamic properties
+  Sequelize;
+  DataTypes;
+  Op;
+
   constructor(options = {}) {
     console.log(JSON.stringify(options));
+  }
 
-    //let Sequelize, DataTypes, Op;
-    /*try {
+  async loadSequelize() {
+    if (this.Sequelize) return;
+    try {
       const sequelizePkg = await import("sequelize");
-      Sequelize = sequelizePkg.Sequelize;
-      DataTypes = sequelizePkg.DataTypes;
-      //Op = sequelizePkg.Op;
-      //this.#Op = Op;
+      this.Sequelize = sequelizePkg.Sequelize;
+      this.DataTypes = sequelizePkg.DataTypes;
+      this.Op = sequelizePkg.Op;
     } catch (err) {
+      console.error(err);
       throw new Error(
         "Sequelize is not installed. Please install it to use PostgresAdapter: npm install sequelize"
       );
-    }*/
-
-    // throw new Error(`Error! ${databasetype} is an unknown database type.`);
+    }
   }
 
   async initializeModels() {
+    await this.loadSequelize();
     this.Article = this.sequelize.define(
       "Article",
       {
-        title: DataTypes.STRING,
-        content: DataTypes.TEXT,
+        title: this.DataTypes.STRING,
+        content: this.DataTypes.TEXT,
         createdAt: {
-          type: DataTypes.DATE,
-          defaultValue: DataTypes.NOW,
+          type: this.DataTypes.DATE,
+          defaultValue: this.DataTypes.NOW,
         },
         updatedAt: {
-          type: DataTypes.DATE,
-          defaultValue: DataTypes.NOW,
+          type: this.DataTypes.DATE,
+          defaultValue: this.DataTypes.NOW,
         },
       },
       {
@@ -53,7 +57,7 @@ export default class SequelizeAdapter {
     this.BlogInfo = this.sequelize.define(
       "BlogInfo",
       {
-        title: DataTypes.STRING,
+        title: this.DataTypes.STRING,
       },
       {
         timestamps: false,
@@ -80,13 +84,14 @@ export default class SequelizeAdapter {
     endId = null,
     order = "DESC"
   ) {
+    await this.loadSequelize();
     const where = {};
     if (startId !== null && endId !== null) {
       where.id = {
-        [Op.between]: [Math.min(startId, endId), Math.max(startId, endId)],
+        [this.Op.between]: [Math.min(startId, endId), Math.max(startId, endId)],
       };
     } else if (startId !== null) {
-      where.id = { [order === "DESC" ? Op.lte : Op.gte]: startId };
+      where.id = { [order === "DESC" ? this.Op.lte : this.Op.gte]: startId };
     }
     const options = {
       where,

package/model/SqliteAdapter.js

@@ -1,4 +1,3 @@
-import { Sequelize } from "sequelize";
 import SequelizeAdapter from "./SequelizeAdapter.js";
 
 export default class SqliteAdapter extends SequelizeAdapter {
@@ -11,8 +10,9 @@ export default class SqliteAdapter extends SequelizeAdapter {
   }
 
   async initialize() {
+    await this.loadSequelize();
     try {
-      this.sequelize = new Sequelize({
+      this.sequelize = new this.Sequelize({
         dialect: "sqlite",
         storage: this.dbname + ".db",
         logging: false,

package/package.json

@@ -1,13 +1,14 @@
 {
   "name": "@lexho111/plainblog",
-  "version": "0.5.11",
+  "version": "0.5.12",
   "description": "A tool for creating and serving a minimalist, single-page blog.",
   "main": "index.js",
   "type": "module",
   "scripts": {
     "dev": "node index.js",
     "test": "node --experimental-vm-modules node_modules/jest/bin/jest.js",
-    "lint": "eslint ."
+    "lint": "eslint .",
+    "knip": "knip"
   },
   "keywords": [
     "blog",
@@ -18,26 +19,21 @@
   "license": "ISC",
   "dependencies": {
     "autoprefixer": "^10.4.23",
-    "child_process": "^1.0.2",
     "cssnano": "^7.1.2",
-    "fs": "^0.0.1-security",
-    "http": "^0.0.1-security",
     "node-fetch": "^3.3.2",
-    "path": "^0.12.7",
-    "postcss": "^8.5.6",
-    "postcss-preset-env": "^10.6.0",
-    "sass": "^1.97.1",
-    "url": "^0.11.4",
-    "util": "^0.12.5"
+    "postcss": "^8.5.6"
   },
   "devDependencies": {
-    "dom-parser": "^1.1.5",
-    "eslint": "^9.8.0",
+    "@eslint/js": "^9.39.2",
+    "@types/node": "^25.0.3",
+    "eslint": "^9.39.2",
     "eslint-plugin-jest": "^28.6.0",
+    "globals": "^17.0.0",
     "jest": "^29.7.0",
-    "sqlite3": "^5.1.7"
+    "typescript": "^5.9.3"
   },
   "optionalDependencies": {
+    "sqlite3": "^5.1.7",
     "pg": "^8.16.3",
     "pg-hstore": "^2.3.4",
     "sequelize": "^6.37.7"

package/test/blog.test.js

@@ -4,6 +4,7 @@ import fs from "node:fs";
 import Blog from "../Blog.js";
 import Article from "../Article.js";
 import { jest } from "@jest/globals";
+import DatabaseModel from "../model/DatabaseModel.js";
 
 describe("test blog", () => {
   test("blog bootstrap stage 1", () => {
@@ -147,6 +148,73 @@ describe("test blog", () => {
     // Clean up the spy to restore the original console.log
     consoleSpy.mockRestore();
   });
+  test("json() returns a deep copy (immutability check)", () => {
+    const myblog = new Blog();
+    const article = new Article("Original Title", "Content", new Date());
+    myblog.addArticle(article);
+
+    const json = myblog.json();
+
+    // Attempt to modify the returned JSON
+    json.title = "Modified Title";
+    json.articles[0].title = "Modified Article";
+    json.database.host = "evil.com";
+
+    // Verify the internal state is unchanged
+    const newJson = myblog.json();
+    expect(newJson.title).not.toBe("Modified Title");
+    expect(newJson.articles[0].title).toBe("Original Title");
+    expect(newJson.database.host).toBe("localhost");
+  });
+
+  test("closeServer handles non-running server gracefully", async () => {
+    const myblog = new Blog();
+    // Should not throw even if server was never started
+    await expect(myblog.closeServer()).resolves.not.toThrow();
+  });
+
+  test("init() runs database operations concurrently", async () => {
+    const myblog = new Blog();
+    // Avoid file operations to isolate database timing
+    myblog.stylesheetPath = [];
+
+    const delay = 100;
+
+    // Mock DatabaseModel methods to simulate slow DB operations
+    const getTitleSpy = jest
+      .spyOn(DatabaseModel.prototype, "getBlogTitle")
+      .mockImplementation(async () => {
+        await new Promise((resolve) => setTimeout(resolve, delay));
+        return "Mock Title";
+      });
+
+    const findAllSpy = jest
+      .spyOn(DatabaseModel.prototype, "findAll")
+      .mockImplementation(async () => {
+        await new Promise((resolve) => setTimeout(resolve, delay));
+        return [];
+      });
+
+    // Mock initialize to avoid side effects
+    const initSpy = jest
+      .spyOn(DatabaseModel.prototype, "initialize")
+      .mockResolvedValue();
+
+    const start = Date.now();
+    await myblog.init();
+    const end = Date.now();
+    const duration = end - start;
+
+    // If sequential: delay + delay = 200ms. If concurrent: ~100ms.
+    expect(duration).toBeLessThan(delay * 1.8);
+    expect(getTitleSpy).toHaveBeenCalled();
+    expect(findAllSpy).toHaveBeenCalled();
+
+    // Cleanup
+    getTitleSpy.mockRestore();
+    findAllSpy.mockRestore();
+    initSpy.mockRestore();
+  });
 });
 
 /*

package/test/simpleServer.js

@@ -1,7 +1,5 @@
 import http from "http";
 
-const port = 8081;
-
 export const server = http.createServer((req, res) => {
   // Set CORS headers to allow requests from different origins if needed
   res.setHeader("Access-Control-Allow-Origin", "*");