@lexho111/plainblog 0.5.9 → 0.5.11

package/Blog.js

@@ -11,8 +11,9 @@ 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);
+const execPromise = promisify(exec); // x
 
 export default class Blog {
   constructor() {
@@ -21,31 +22,53 @@ export default class Blog {
       username: "user",
       password: "password",
       host: "localhost",
-      dbname: "blog.json",
+      dbname: "blog.json", // x
     };
     this.#title = "";
-    this.articles = [];
-    this.filename = null;
+    this.#articles = [];
     this.#server = null;
     this.#password = "admin";
-    this.styles = "body { font-family: Arial; }";
-    this.scripts = "";
+    this.#styles = "body { font-family: Arial; }";
+    //this.scripts = "";
     this.compiledStyles = "";
-    this.compiledScripts = "";
+    //this.compiledScripts = "";
     this.reloadStylesOnGET = false;
     this.sessions = new Set();
 
-    const version = pkg.version;
-    console.log(`version: ${version}`);
+    this.#version = pkg.version;
+    console.log(`version: ${this.#version}`);
+  }
+
+  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 
+      }
+
+    return JSON.parse(JSON.stringify(json));
   }
 
   // Private fields
+  #version = null;
   #server = null;
   #password = null;
   #databaseModel;
   #isExternalAPI = false;
   #apiUrl = "";
   #title = "";
+  #articles = [];
+  #styles = "";
   #stylesHash = "";
   #scriptsHash = "";
   #stylesheetPath = "";
@@ -59,7 +82,7 @@ export default class Blog {
   }
 
   setStyle(style) {
-    this.styles += style;
+    this.#styles += style;
   }
 
   set title(t) {
@@ -88,7 +111,7 @@ export default class Blog {
   }
 
   set style(style) {
-    this.styles += style;
+    this.#styles += style;
   }
 
   set stylesheetPath(files) {
@@ -97,68 +120,71 @@ export default class Blog {
   }
 
   addArticle(article) {
-    this.articles.push(article);
+    this.#articles.push(article);
   }
 
-  isAuthenticated(req) {
+  #isAuthenticated(req) {
       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 = "";
-        req.on("data", (chunk) => (data += chunk.toString()));
-        req.on("end", () => resolve(data));
-        req.on("error", reject);
+  async #handleLogin(req, res) {
+    const body = await new Promise((resolve, reject) => {
+      let data = "";
+      req.on("data", (chunk) => (data += chunk.toString()));
+      req.on("end", () => resolve(data));
+      req.on("error", reject);
+    });
+    const params = new URLSearchParams(body);
+
+    if (params.get("password") === this.#password) {
+      const id = crypto.randomUUID();
+      this.sessions.add(id);
+      res.writeHead(303, {
+        "Set-Cookie": `session=${id}; HttpOnly; Path=/`,
+        Location: "/",
       });
-      const params = new URLSearchParams(body);
-  
-      if (params.get("password") === this.#password) {
-        const id = crypto.randomUUID();
-        this.sessions.add(id);
-        res.writeHead(303, {
-          "Set-Cookie": `session=${id}; HttpOnly; Path=/`,
-          Location: "/",
-        });
-        res.end();
-      } else {
-        res.writeHead(401, { "Content-Type": "text/html" });
-        res.end(`${header("My Blog")}
+      res.end();
+    } else {
+      res.writeHead(401, { "Content-Type": "text/html" });
+      res.end(`${header("My Blog")}
 <body>
 <h1>Unauthorized</h1><p>Please enter the password.<form method="POST">
 <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 sessionId = params.get("session");
-        if (this.sessions.has(sessionId)) {
-          this.sessions.delete(sessionId);
-        }
+  #handleLogout(req, res) {
+    if (req.headers.cookie) {
+      const params = new URLSearchParams(req.headers.cookie.replace(/; /g, "&"));
+      const sessionId = params.get("session");
+      if (this.sessions.has(sessionId)) {
+        this.sessions.delete(sessionId);
       }
-      res.writeHead(303, {
-        "Set-Cookie": "session=; HttpOnly; Path=/; Max-Age=0",
-        Location: "/",
-      });
-      res.end();
     }
+    res.writeHead(303, {
+      "Set-Cookie": "session=; HttpOnly; Path=/; Max-Age=0",
+      Location: "/",
+    });
+    res.end();
+  }
 
   /** initializes database */
   async init() {
-    //await this.buildFrontend();
     //this.loadStyles();
     //this.loadScripts();
+    // if there is a stylesheet path provided, process it
     if(this.#stylesheetPath != null) {
-      await this.processStylesheets(this.#stylesheetPath);
+      // read file from stylesheet path, compare checksums and write to public/styles.min.css
+      await this.#processStylesheets(this.#stylesheetPath);
     }
     if(!this.#stylesheetPath) { 
-      // compile and merge hardcoded styles with src/styles.css and write to file "styles.min.css"
+      // 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);
@@ -167,32 +193,26 @@ export default class Blog {
       const publicStylePath = path.join(__dirname, "public", "styles.min.css");
 
       let publicHash = null;
-      try {
-        const publicCSS = await fs.promises.readFile(publicStylePath, "utf8");
-        const match = publicCSS.match(/\/\* source-hash: ([a-f0-9]{64}) \*\//);
-        if (match) {
-          publicHash = match[1];
-        }
-      } catch (err) {
-        // public/styles.min.css doesn't exist, will be created.
-      }
-
       let srcStyles = "";
-      try {
-        srcStyles = await fs.promises.readFile(srcStylePath, "utf8");
-      } catch (err) {
-        // ignore if src/styles.css doesn't exist
-      }
 
-      const combinedStyles = this.styles + 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
+      ]);
+
+      const combinedStyles = this.#styles + srcStyles;
       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);
-        const finalStyles = this.styles + " " + srcStyles;
+        const finalStyles = await mergeStyles(this.#styles, srcStyles);
         try {
-          await fs.promises.mkdir(path.dirname(publicStylePath), { recursive: true });
+          //await fs.promises.mkdir(path.dirname(publicStylePath), { recursive: true });
           await fs.promises.writeFile(publicStylePath, finalStyles + `\n/* source-hash: ${srcHash} */`);
         } catch (err) {
           console.error("Failed to write styles to public folder:", err);
@@ -201,7 +221,7 @@ export default class Blog {
     }
     if (this.#isExternalAPI) {
       console.log("external API");
-      await this.loadFromAPI();
+      await this.#loadFromAPI();
     } else {
       console.log(`database: ${this.database.type}`);
       if (!this.#databaseModel) {
@@ -209,10 +229,11 @@ export default class Blog {
       }
       console.log(`connected to database`);
       await this.#databaseModel.initialize();
-      const dbTitle = await this.#databaseModel.getBlogTitle();
-      const dbArticles = await this.#databaseModel.findAll();
-      //console.log(`articles: ${JSON.stringify(dbarticles)}`)
-      console.log(`dbArticles.length: ${dbArticles.length}`)
+      const [dbTitle, dbArticles] = await Promise.all([
+        this.#databaseModel.getBlogTitle(),
+        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())); 
@@ -244,12 +265,14 @@ export default class Blog {
       const newArticleData = { title, content };
       try {
         // Save the new article to the database via the ApiServer
-        if (this.#databaseModel) await this.#databaseModel.save(newArticleData);
-        if (this.#isExternalAPI) await postData(this.#apiUrl, newArticleData);
+        const promises = [];
+        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()));
+        this.#articles.unshift(new Article(title, content, new Date()));
         // remove sample entries
-        this.articles = this.articles.filter(
+        this.#articles = this.#articles.filter(
           (art) =>
             art.title !== "Sample Entry #1" && art.title !== "Sample Entry #2"
         );
@@ -286,18 +309,18 @@ export default class Blog {
 </body></html>`);
           return;
         } else if (req.method === "POST") {
-          await this.handleLogin(req, res);
+          await this.#handleLogin(req, res);
           return;
         }
       }
 
       if (req.url === "/logout") {
-        this.handleLogout(req, res);
+        this.#handleLogout(req, res);
         return;
       }
       // POST new article
       if (req.method === "POST" && req.url === "/") {
-        if (!this.isAuthenticated(req)) {
+        if (!this.#isAuthenticated(req)) {
           res.writeHead(403, { "Content-Type": "text/plain" });
           res.end("Forbidden");
           return;
@@ -310,12 +333,12 @@ export default class Blog {
         // reload styles and scripts on (every) request
         if(this.reloadStylesOnGET) {
           if (this.#stylesheetPath) {
-            await this.processStylesheets(this.#stylesheetPath);
+            await this.#processStylesheets(this.#stylesheetPath);
           }
         }
 
         let loggedin = false;
-        if (!this.isAuthenticated(req)) { 
+        if (!this.#isAuthenticated(req)) { 
           // login
           loggedin = false;
         } else {
@@ -374,8 +397,11 @@ export default class Blog {
 
     this.#server = server;
 
-    return new Promise((resolve) => {
-      this.#server.listen(port, () => {
+    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.removeListener("error", errorHandler);
         console.log(`server running at http://localhost:${port}/`);
         resolve(); // Resolve the promise when the server is listening
       });
@@ -386,7 +412,7 @@ export default class Blog {
     return new Promise((resolve, reject) => {
       if (this.#server) {
         this.#server.close((err) => {
-          if (err) return reject(err);
+          if (err && err.code !== "ERR_SERVER_NOT_RUNNING") return reject(err);
           console.log("Server closed.");
           resolve();
         });
@@ -398,19 +424,19 @@ export default class Blog {
 
   /** Populates the blog's title and articles from a data object. */
   #applyBlogData(data) {
-    this.articles = []; // Clear existing articles before loading new ones
+    this.#articles = []; // Clear existing articles before loading new ones
     this.#title = data.title;
-    // Assuming the API returns an array of objects with title and content
+    // 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);
-        article.id = articleData.id;
+        article.id = articleData.id; // TODO x
         this.addArticle(article);
       }
     }
   }
 
-  async loadFromAPI() {
+  async #loadFromAPI() {
     const data = await fetchData(this.#apiUrl);
     if (data) {
       this.#applyBlogData(data);
@@ -451,7 +477,7 @@ export default class Blog {
 
     // POST a new article
   } else if (req.method === "POST" && pathname === "/api/articles") {
-      if (!this.isAuthenticated(req)) {
+      if (!this.#isAuthenticated(req)) {
         res.writeHead(403, { "Content-Type": "application/json" });
         res.end(JSON.stringify({ error: "Forbidden" }));
         return;
@@ -481,7 +507,7 @@ export default class Blog {
   print() {
     const data = {
       title: this.title,
-      articles: this.articles,
+      articles: this.#articles,
     };
     const markdown = formatMarkdown(data);
     console.log(markdown);
@@ -491,7 +517,7 @@ export default class Blog {
   async toHTML(loggedin) {
     const data = {
       title: this.title,
-      articles: this.articles,
+      articles: this.#articles,
       loggedin,
       login: ""
     };
@@ -505,19 +531,16 @@ export default class Blog {
   }
 
   /**
-   * Loads files, generates checksums and compiles sass files to css if anything changed
+   * read files, compare checksums, compile and write to public/styles.min.css
    * @param {string[]} files - Array of css/scss file paths to process.
    */
-  async processStylesheets(files) {
+  async #processStylesheets(files) {
     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 __filename = fileURLToPath(import.meta.url);
-    const __dirname = path.dirname(__filename);
     const styleFiles = fileList.filter(
       (f) => typeof f === "string" && (f.endsWith(".scss") || f.endsWith(".css")) && !f.endsWith(".min.css")
     );
@@ -552,8 +575,7 @@ export default class Blog {
         this.#stylesHash = currentHash;
         
         // Compile styles using the standalone script from build-styles.js
-        //this.compiledStyles = await compileStyles(fileData);
-        this.compiledStyles = fileData.map((f) => f.content).join("\n");
+        this.compiledStyles = await compileStyles(fileData);
 
         // generate a file
         const __filename = fileURLToPath(import.meta.url);

package/build-styles.js

@@ -0,0 +1,59 @@
+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
+export async function compileStyles(fileData) {
+  try {
+    let combinedCss = "";
+
+    if (fileData) {
+      const scssFiles = fileData.filter(
+        (f) =>
+          f.path.endsWith(".scss") && !path.basename(f.path).startsWith("_")
+      );
+
+      for (const file of scssFiles) {
+        console.error("sass files are not supported.");
+      }
+
+      const cssFiles = fileData.filter((f) => f.path.endsWith(".css"));
+      for (const file of cssFiles) {
+        combinedCss += file.content + "\n";
+      }
+    }
+
+    // 2. PostCSS (Autoprefixer + CSSNano)
+    if (combinedCss) {
+      const plugins = [autoprefixer(), cssnano()];
+      const result = await postcss(plugins).process(combinedCss, {
+        from: undefined,
+      });
+      return result.css;
+    }
+    return "";
+  } catch (error) {
+    console.error("Build failed:", error);
+    return "";
+  }
+}
+
+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 "";
+  } catch (error) {
+    console.error("Merge failed:", error);
+    return "";
+  }
+}

package/model/PostgresAdapter.js

@@ -12,6 +12,7 @@ export default class PostgresAdapter extends SequelizeAdapter {
     this.host = options.host;
     if (options.dbname) this.dbname = options.dbname;
     if (options.dbport) this.dbport = options.dbport;
+    else this.dbport = 5432;
     if (!this.username || !this.password || !this.host) {
       throw new Error(
         "PostgreSQL credentials not set. Please provide 'username', 'password', and 'host' in the options."
@@ -21,24 +22,39 @@ export default class PostgresAdapter extends SequelizeAdapter {
 
   async initialize() {
     console.log("initialize database");
+    const maxRetries = 10;
+    const retryDelay = 3000;
 
-    try {
-      console.log(
-        `postgres://${this.username}:${this.password}@${this.host}:${this.dbport}/${this.dbname}`
-      );
+    for (let attempt = 1; attempt <= maxRetries; attempt++) {
+      try {
+        console.log(
+          `postgres://${this.username}:${this.password}@${this.host}:${this.dbport}/${this.dbname}`
+        );
 
-      this.sequelize = new Sequelize(
-        `postgres://${this.username}:${this.password}@${this.host}:${this.dbport}/${this.dbname}`,
-        { logging: false }
-      );
-    } catch (err) {
-      if (err.message.includes("Please install")) {
-        throw new Error(
-          "PostgreSQL driver is not installed. Please install it to use PostgresAdapter: npm install pg pg-hstore"
+        this.sequelize = new Sequelize(
+          `postgres://${this.username}:${this.password}@${this.host}:${this.dbport}/${this.dbname}`,
+          { logging: false }
+        );
+        await this.sequelize.authenticate();
+        await this.initializeModels();
+        console.log("Database connection established successfully.");
+        return;
+      } catch (err) {
+        if (err.message.includes("Please install")) {
+          throw new Error(
+            "PostgreSQL driver is not installed. Please install it to use PostgresAdapter: npm install pg pg-hstore"
+          );
+        }
+        console.error(
+          `Database connection attempt ${attempt} failed: ${err.message}`
         );
+        if (attempt === maxRetries) {
+          console.error("Max retries reached. Exiting.");
+          throw err;
+        }
+        console.log(`Retrying in ${retryDelay / 1000} seconds...`);
+        await new Promise((resolve) => setTimeout(resolve, retryDelay));
       }
-      throw err;
     }
-    await this.initializeModels();
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lexho111/plainblog",
-  "version": "0.5.9",
+  "version": "0.5.11",
   "description": "A tool for creating and serving a minimalist, single-page blog.",
   "main": "index.js",
   "type": "module",
@@ -17,11 +17,15 @@
   "author": "lexho111",
   "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"

package/public/styles.min.css

@@ -1,68 +1,2 @@
-body { font-family: Arial; } .grid {
-  border: 0 solid #000;
-  display: grid;
-  gap: 0.25rem;
-  grid-template-columns: 1fr;
-}
-.grid article {
-  border: 0 solid #ccc;
-  border-radius: 4px;
-  min-width: 0;
-  overflow-wrap: break-word;
-  padding: 0.25rem;
-}
-.grid article h2 {
-  color: rgb(53, 53, 53);
-  margin-bottom: 5px;
-}
-
-.grid article .datetime {
-  margin: 0;
-  color: rgb(117, 117, 117);
-}
-
-.grid article p {
-  margin-top: 10px;
-  margin-bottom: 0;
-}
-
-article a {
-  color: rgb(105, 105, 105);
-}
-
-article a:visited {
-  color: rgb(105, 105, 105);
-}
-
-h1 {
-  color: #696969;
-}
-nav a {
-  color: #3b40c1;
-  font-size: 20px;
-  text-decoration: underline;
-}
-nav a:visited {
-  color: #3b40c1;
-  text-decoration-color: #3b40c1;
-}
-
-#wrapper {
-  max-width: 500px;
-  width: 100%;
-}
-
-/* Mobile Layout (screens smaller than 1000px) */
-@media screen and (max-width: 1000px) {
-  * {
-    font-size: 4vw;
-  }
-  #wrapper {
-    max-width: 100%;
-    width: 100%;
-    padding: 0 10px; /* Prevents text from touching the edges */
-    box-sizing: border-box;
-  }
-}
-
-/* source-hash: bcb6644ec5b5c6f9685c9ad6c14ee551a6f908b8a2c372d3294e2d2e80d17fb7 */
+body{background-color:#fdfdfd;font-family:Arial}nav a{color:#3b40c1;font-size:20px;text-decoration:underline}.datetime{color:#434343;font-style:normal}h2{color:#a9a9a9;margin:0 0 5px}p{margin-top:10px}span{margin:0}
+/* source-hash: fa9deb7a7f0781f463cd3e8fd3c3ceddec518535b0a6d13af7309ef9a2f76c32 */

package/test/blog.test.js

@@ -6,6 +6,46 @@ import Article from "../Article.js";
 import { jest } from "@jest/globals";
 
 describe("test blog", () => {
+  test("blog bootstrap stage 1", () => {
+    const myblog = new Blog();
+    const json = myblog.json();
+    expect(json.version).toContain(".");
+    const database = json.database;
+    expect(database.type).toBe("file");
+    expect(database.username).toBe("user");
+    expect(database.password).toBe("password");
+    expect(database.host).toBe("localhost");
+    expect(database.dbname).toBe("articles.txt"); //TODO switch blog.json to articles.txt, bloginfo.json
+    expect(json.password).toBe("admin");
+    expect(json.styles).toContain("body { font-family: Arial; }");
+    expect(json.reloadStylesOnGET).not.toBeTruthy();
+  });
+  test("blog bootstrap stage 2", async () => {
+    const myblog = new Blog();
+    await myblog.init();
+    const json = myblog.json();
+    console.log(json);
+    expect(json.title).toBe("Test Blog Title");
+    expect(json.articles.length).toBeGreaterThan(2);
+    expect(json.server).toBeNull();
+  });
+  test("blog bootstrap stage 3", async () => {
+    const myblog = new Blog();
+    await myblog.init();
+    try {
+      await myblog.startServer(8080);
+      const json = myblog.json();
+      console.log(json);
+      expect(json.title).toBe("Test Blog Title"); // from bloginfo.json
+      expect(json.articles.length).toBeGreaterThan(2);
+      expect(json.server.listening).toBeTruthy();
+      expect(json.server.address.address).toBe("127.0.0.1");
+      expect(json.server.address.family).toBe("IPv4");
+      expect(json.server.address.port).toBe(8080);
+    } finally {
+      await myblog.closeServer();
+    }
+  });
   test("is valid html", async () => {
     const myblog = new Blog();
     const html = await myblog.toHTML();
@@ -35,21 +75,27 @@ describe("test blog", () => {
     const article = new Article("", "");
     myblog.addArticle(article);
     const html = await myblog.toHTML();
+    const json = myblog.json();
     expect(html).toContain("<article");
-    expect(myblog.articles.length).toBe(1);
+    expect(json.articles).toHaveLength(1);
   });
   test("add articles", async () => {
     const myblog = new Blog();
-    expect(myblog.articles.length).toBe(0);
+    const json = myblog.json();
+    expect(json.articles).toHaveLength(0);
     const size = 10;
     for (let i = 1; i <= size; i++) {
       const article = new Article("", "");
       myblog.addArticle(article);
-      expect(myblog.articles.length).toBe(i);
+      const json = myblog.json();
+      expect(json.articles).toHaveLength(i);
+    }
+    {
+      const html = await myblog.toHTML();
+      expect(html).toContain("<article");
+      const json = myblog.json();
+      expect(json.articles).toHaveLength(size);
     }
-    const html = await myblog.toHTML();
-    expect(html).toContain("<article");
-    expect(myblog.articles.length).toBe(size);
   });
   const __filename = fileURLToPath(import.meta.url);
   const __dirname = path.dirname(__filename);
@@ -58,13 +104,13 @@ describe("test blog", () => {
     const styles = [
       {
         style: "body { font-family: Courier; }",
-        expected: "font-family: Courier",
+        expected: "font-family:Courier",
       },
       {
         style: "body{ background-color:black; color:white; }",
-        expected: "background-color:black; color:white",
+        expected: "background-color:#000;color:#fff;",
       },
-      { style: "body{ font-size: 1.2em; }", expected: "font-size: 1.2em" },
+      { style: "body{ font-size: 1.2em; }", expected: "font-size:1.2em" },
     ];
     for (const style of styles) {
       const cssPath = path.join(publicDir, "styles.min.css");

package/test/model.test.js

@@ -13,6 +13,7 @@ import {
 } from "../model/FileModel.js";
 
 import SqliteAdapter from "../model/SqliteAdapter.js";
+import FileAdapter from "../model/FileAdapter.js";
 
 function generateRandomContent(length) {
   let str = "";
@@ -25,44 +26,6 @@ function generateRandomContent(length) {
   return str;
 }
 
-describe("File Model test", () => {
-  it("should init files and load info", async () => {
-    const infoFile = "test_bloginfo.json";
-    const articlesFile = "test_articles.txt";
-
-    // Ensure clean state
-    if (fs.existsSync(infoFile)) fs.unlinkSync(infoFile);
-    if (fs.existsSync(articlesFile)) fs.unlinkSync(articlesFile);
-
-    await initFiles(infoFile, articlesFile);
-
-    const info = await loadInfo(infoFile);
-    expect(info.title).toBe("Blog");
-
-    // Cleanup
-    fs.unlinkSync(infoFile);
-    fs.unlinkSync(articlesFile);
-  });
-
-  it("should write to articles.txt file", async () => {
-    const content = generateRandomContent(200);
-    const article = new Article("hello", content, new Date().toISOString());
-    const filename = "test_articles.txt";
-
-    await appendArticle(filename, article);
-    const articles = await loadArticles(filename);
-
-    // Compare properties since 'articles' contains plain objects, not Article instances
-    expect(articles.length).toBeGreaterThan(0);
-    const lastArticle = articles[articles.length - 1];
-    expect(lastArticle.title).toBe(article.title);
-    expect(lastArticle.content).toBe(article.content);
-
-    // Cleanup
-    if (fs.existsSync(filename)) fs.unlinkSync(filename);
-  });
-});
-
 describe("API Model test", () => {
   beforeAll((done) => {
     const port = 8081;
@@ -127,55 +90,140 @@ describe("API Model test", () => {
 });
 
 describe("Database Model test", () => {
-  it("should be empty", async () => {
-    const blog = new Blog();
-    blog.database.type = "sqlite";
-    blog.database.dbname = "test";
-    blog.setStyle(
-      "body { font-family: Arial, sans-serif; } h1 { color: #333; }"
-    );
+  describe("Sqlite Database Adapter test", () => {
+    it("should be empty", async () => {
+      const blog = new Blog();
+      const sqliteAdapter = new SqliteAdapter({
+        dbname: "blog",
+      });
+      blog.setDatabaseAdapter(sqliteAdapter);
+      await blog.init();
+
+      expect(await blog.toHTML()).not.toContain("<article>");
+      expect(blog).toBeDefined();
+    });
 
-    //const article = new Article("hello", "hello world1!");
-    //blog.postArticle(article);
+    it("should load blog data from sqlite database", async () => {
+      const blog = new Blog();
+      const sqliteAdapter = new SqliteAdapter({
+        dbname: "blog",
+      });
+      blog.setDatabaseAdapter(sqliteAdapter);
+      await blog.init();
+
+      const content = generateRandomContent(200);
+
+      await new Promise((resolve) => {
+        const req = {
+          on: (event, cb) => {
+            if (event === "data") {
+              setTimeout(() => cb(`title=hello&content=${content}`), 0);
+            }
+            if (event === "end") {
+              setTimeout(() => cb(), 20);
+            }
+          },
+          off: () => {},
+        };
+        const res = {
+          writeHead: () => {},
+          end: resolve,
+        };
+        blog.postArticle(req, res);
+      });
+
+      expect(await blog.toHTML()).toContain(content);
+      expect(blog).toBeDefined();
+    });
+  });
+  describe("Postgres Adapter test", () => {});
+  describe("File Adapter test", () => {
+    it("should update blog title", async () => {
+      const title_org = "Test Blog Title";
+      const fileAdapter = new FileAdapter();
+      await fileAdapter.initialize();
+      await fileAdapter.updateBlogTitle(title_org);
+      const title = await fileAdapter.getBlogTitle();
+      console.log(title);
+      expect(title).toBe(title_org);
+    });
+  });
+  describe("File Model test", () => {
+    it("should init files and load info", async () => {
+      const infoFile = "test_bloginfo.json";
+      const articlesFile = "test_articles.txt";
 
-    //await blog.load("blog.json");
+      // Ensure clean state
+      if (fs.existsSync(infoFile)) fs.unlinkSync(infoFile);
+      if (fs.existsSync(articlesFile)) fs.unlinkSync(articlesFile);
 
-    expect(await blog.toHTML()).not.toContain("<article>");
-    expect(blog).toBeDefined();
-  });
+      await initFiles(infoFile, articlesFile);
 
-  it("should load blog data from sqlite database", async () => {
-    const blog = new Blog();
-    const sqliteAdapter = new SqliteAdapter({
-      dbname: "blog",
+      const info = await loadInfo(infoFile);
+      expect(info.title).toBe("Blog");
+
+      // Cleanup
+      fs.unlinkSync(infoFile);
+      fs.unlinkSync(articlesFile);
     });
-    blog.setDatabaseAdapter(sqliteAdapter);
-    await blog.init();
 
-    const content = generateRandomContent(200);
+    it("should read and write to articles.txt file", async () => {
+      const content = generateRandomContent(200);
+      const article = new Article("hello", content, new Date().toISOString());
+      const filename = "test_articles.txt";
 
-    await new Promise((resolve) => {
-      const req = {
-        on: (event, cb) => {
-          if (event === "data") {
-            setTimeout(() => cb(`title=hello&content=${content}`), 0);
-          }
-          if (event === "end") {
-            setTimeout(() => cb(), 20);
-          }
-        },
-        off: () => {},
-      };
-      const res = {
-        writeHead: () => {},
-        end: resolve,
-      };
-      blog.postArticle(req, res);
+      await appendArticle(filename, article);
+      const articles = await loadArticles(filename);
+
+      // Compare properties since 'articles' contains plain objects, not Article instances
+      expect(articles.length).toBeGreaterThan(0);
+      const lastArticle = articles[articles.length - 1];
+      expect(lastArticle.title).toBe(article.title);
+      expect(lastArticle.content).toBe(article.content);
+
+      // Cleanup
+      if (fs.existsSync(filename)) fs.unlinkSync(filename);
     });
 
-    //await blog.load("blog.json");
+    it("should be empty articles.txt", async () => {
+      const filename = "test_articles_empty.txt";
+      const articles = await loadArticles(filename);
+      expect(articles.length).toBe(0);
+      // Cleanup
+      if (fs.existsSync(filename)) fs.unlinkSync(filename);
+    });
 
-    expect(await blog.toHTML()).toContain(content);
-    expect(blog).toBeDefined();
+    it("should read and write multiple articles to articles.txt file", async () => {
+      const filename = "test_articles.txt";
+
+      // Ensure clean state
+      if (fs.existsSync(filename)) fs.unlinkSync(filename);
+
+      try {
+        const articles_org = [];
+        const count = 20;
+        for (let i = 0; i < count; i++) {
+          const title = generateRandomContent(20);
+          const content = generateRandomContent(200);
+          const article = new Article(title, content, new Date().toISOString());
+          articles_org.push(article);
+
+          await appendArticle(filename, article);
+        }
+        const articles = await loadArticles(filename);
+
+        // Compare properties since 'articles' contains plain objects, not Article instances
+        expect(articles).toHaveLength(count);
+
+        for (let i = 0; i < articles.length; i++) {
+          expect(articles[i].title).toBe(articles_org[i].title);
+          expect(articles[i].content).toBe(articles_org[i].content);
+          expect(articles[i].createdAt).toBe(articles_org[i].createdAt);
+        }
+      } finally {
+        // Cleanup
+        if (fs.existsSync(filename)) fs.unlinkSync(filename);
+      }
+    });
   });
 });

package/test/styles.test.js

@@ -16,10 +16,26 @@ describe("Blog Stylesheet Test", () => {
     expect(data).toContain("body");
     expect(data).toContain("nav a");
     expect(data).toContain(".datetime");
-    expect(data).toContain("font-style: normal");
     expect(data).toContain("color: darkgray");
   });
 
+  it("should load the stylesheet (.css) file from public", async () => {
+    const filepath = path.join(__dirname, "../public/styles.min.css");
+
+    const data = await fs.promises.readFile(filepath, "utf8");
+    console.log(data);
+    expect(data).toContain("font-family:Arial");
+    expect(data).toContain("h1");
+    expect(data).toContain(".grid{");
+    expect(data).toContain(".grid article");
+    expect(data).toContain("nav a");
+    expect(data).toContain(".datetime");
+    expect(data).toContain("nav a:visited{");
+    expect(data).toContain("@media screen");
+    expect(data).toContain("#wrapper{");
+    expect(data).not.toContain("color:darkgray");
+  });
+
   it("should load and compile the stylesheet (.css) correctly", async () => {
     const blog = new Blog();
     blog.title = "My Blog";
@@ -38,7 +54,7 @@ describe("Blog Stylesheet Test", () => {
     expect(publicCSS).toContain("body");
     expect(publicCSS).toContain("nav a");
     expect(publicCSS).toContain(".datetime");
-    expect(publicCSS).toContain("font-style: normal");
+    expect(publicCSS).toContain("font-style:normal");
     expect(publicCSS).toContain("color:");
   });
 
@@ -60,7 +76,7 @@ describe("Blog Stylesheet Test", () => {
     expect(publicCSS).toContain("body");
     expect(publicCSS).toContain("nav a");
     expect(publicCSS).toContain(".datetime");
-    expect(publicCSS).toContain("font-style: normal");
+    expect(publicCSS).toContain("font-style:normal");
     expect(publicCSS).toContain("color:");
   });
 });

package/articles.txt

@@ -1,3 +0,0 @@
-{"title":"Test Title from Jest","content":"This is the content of the test article.","createdAt":"2026-01-08T13:19:39.939Z"}
-{"title":"Test Title from Jest","content":"This is the content of the test article.","createdAt":"2026-01-08T13:34:38.866Z"}
-{"title":"Test Title from Jest","content":"This is the content of the test article.","createdAt":"2026-01-08T13:43:32.343Z"}

package/blog.json

@@ -1,110 +0,0 @@
-{
-  "title": "",
-  "articles": [
-    {
-      "title": "hello",
-      "content": "hML`JfDS]ARPVAfsGdogseNVYPXTpZaJhKJkPoMTWA\\q[CkNsXYrUGyGHWTDZpByubZMf_Y\\bMELh[]afM^XMAFqvxuyWat^hqSBMIifvbTdHNOQP_rbwwlWnGvVbPi]jlTIixyAaaU_]ecJYTjr]FqLq`UY\\XoYqhmuY`rvWH]EZO`tBHZSan`mAuhnwpXgdRJtjtH[",
-      "createdAt": "2026-01-07T12:49:43.098Z"
-    },
-    {
-      "title": "hello",
-      "content": "HgcFKFWDMl]cxiCVVrgFddJaOQCSPF^KYkROxkLTmxSc^ZssZh`ENyOXZn_DtOQe^V_vbu^KRonZ]bGcqsP]FYMmY\\YLjWknhiUksXwIUsvtpfXqViiKJ`xcmScZRXfAdHshvFlEHvPXWOfZRRIDIOxAafPoMD[ZgVlFkl\\Uw]RfubZWQ]`IHIUOKea_RTO`KiZisSA[",
-      "createdAt": "2026-01-07T12:49:43.444Z"
-    },
-    {
-      "title": "Test Title from Jest",
-      "content": "This is the content of the test article.",
-      "createdAt": "2026-01-07T13:10:50.239Z"
-    },
-    {
-      "title": "hello",
-      "content": "_\\jAuGsYByS]q\\QsnlqT\\]]TEDDalywtlmwmBZRlL[vtFdGqB\\[dlVx]A^[IV`KjhWU`DW`oorGwUlBU_IMCYoymIFi[`FpXrJfUmLZTRhoisxhXIcWqmk\\SPMV^]dvCuL_Pu^EAcMvBfadWFbUuSxFkjh\\KQyLnNWWsP`agQQkmU\\TAaOvYZAO\\FGtstSbaCJPXRQTO",
-      "createdAt": "2026-01-07T13:10:57.249Z"
-    },
-    {
-      "title": "hello",
-      "content": "HRkfwNRL_r\\DF]tyVBM[AMIjfMoBbohiqUf_T^]LwiJo[duXB`mQiRmmTkbMSJxvvHccfbXsdmKMbuYmxo[JGkwfCpqXSbhKiZID[vouGhbnLZ[wjkFFgm]fOaZcxoWduI`TNvin]\\dXoGW]YtueqSYPRLmGJswvUnyPHhfLUtf`]QNfM]hcvqqZasrQZVcXYjAnJxRP",
-      "createdAt": "2026-01-07T13:10:57.357Z"
-    },
-    {
-      "title": "hello",
-      "content": "UI\\KBodT[CgUg]L^WJ`Tuafq`rS]n\\T_eMqmBQqJVQisfABj^msS]u\\OEoJ]D^CtwE`UY[UbOICHcYPjNqNQ[LlwlJGPOoppSrkaEmDh_tm]CrrPGbBSPxgQQIZ^efcmITQQaAgT_vx[GUepg]LDagmTmihHbOIqHAa_NmRsX_EjxeE]EKhnHwFm]vFUpJTPFiDNU^BE",
-      "createdAt": "2026-01-07T13:17:47.559Z"
-    },
-    {
-      "title": "hello",
-      "content": "aMDnSSZDIZjbfrMlOcjMB\\CPup[GfoqHkLWAi]V_Ctkt[ekYRqIaufps[]TOMcw\\ojbVpPNv`lTTH\\[jbOcJXU[_tBSCsZW\\akiWuRf^mZGGrFxAq^oAdZjHwmJBjt^_GUXnHdXfjSrifiqXdAAdo]EM`aBFpJvyVLnLOfqrqoPrAIhRwoPHRy^lRCLyaS^VXChowHCn",
-      "createdAt": "2026-01-07T13:17:47.681Z"
-    },
-    {
-      "title": "Test Title from Jest",
-      "content": "This is the content of the test article.",
-      "createdAt": "2026-01-07T13:18:50.764Z"
-    },
-    {
-      "title": "hello",
-      "content": "[vL^GSDHJjBq^qdTMyyMm`SGhZhvgXsyTp[kYNkiBDavKevpIkSlWQr`bJaWyH]Qa`LQMKisdHeRvTKm`dviPLkLcJCtWbGPaDnNhJtEcEQM^MmP[RYERk\\uYeXruvPmJMjdvsOxA`btQtTmtBlOvrHLANJhcYRTAXmwOjLhp_SgkhWsB_pcIUQbd^X`RIWAdqUBPVmk",
-      "createdAt": "2026-01-07T13:18:52.387Z"
-    },
-    {
-      "title": "hello",
-      "content": "jRaJYEUFnMoEcjrWFREUuIQEoCtLoEuJSxJapEGpdPvq[GyrOqdSLY`VDlqSMTh\\BgybfwxfQQ_QqKkh\\YcEHYpA^W[ttGyGjA[TdZHn]]yoPWnFyFHJfAUkxkSM[RkQVqxAg_AGoJahaoOsNnoSGx^uM\\smWlWVDGvRcWVW\\rI_[lKnZEifvdPwkCcBRLXKGw[aNedN",
-      "createdAt": "2026-01-07T13:18:52.971Z"
-    },
-    {
-      "title": "Test Title from Jest",
-      "content": "This is the content of the test article.",
-      "createdAt": "2026-01-07T13:22:54.227Z"
-    },
-    {
-      "title": "Test Title from Jest",
-      "content": "This is the content of the test article.",
-      "createdAt": "2026-01-07T13:23:08.140Z"
-    },
-    {
-      "title": "hello",
-      "content": "M_RFGy[auVjFYypv^FdPqesIlcBkg]uoeIwMNLM]TOcDWKw[CFpsPpQWxSAXAupUdVsaiGJgLgIeuJEwBMXk`VG\\OoXIxCERYs`hqGRYGTnP]ZIrOSoJk[MFAxfVjJNMyZycryoRWr\\bhCXlurxgKPFSsTYbhlqZmrqaiJyvXpFsbiLQx^LBcZi`VqZSbjc`TNF_\\Eex",
-      "createdAt": "2026-01-07T13:26:02.437Z"
-    },
-    {
-      "title": "hello",
-      "content": "\\uRyVjar]vDZKHqRqJbEJpZbdKCWmQOGToNFQAqWdJQxSwmKTAGXywMDF`D\\nBA_eJxmFV^XtTuSGNJZTFjYvYibQIlgZdV[YXZpujmuWBgKNNBjrGZLVC[QlRZOwBdY^QPom\\b^WIIkeawsGBaafELGmfmTaIikRhCnCV_SYKEwogtqdfhkMkJslllumPyeGKqe\\cca",
-      "createdAt": "2026-01-07T13:26:02.816Z"
-    },
-    {
-      "title": "Test Title from Jest",
-      "content": "This is the content of the test article.",
-      "createdAt": "2026-01-07T13:26:07.866Z"
-    },
-    {
-      "title": "hello",
-      "content": "UecpUr`PFkpfKJ^V^q[T_lTr\\uP\\WFwcFtZgrdoao[japNpDycoAgWyELuIZtQroKxXSYdI]LrDTQSGqegWjgArWk[[eYXpy_OchWDywkus`GLcdwwr[qHoLINIdUoB^C]JcLfacOEJtMZOeWjRNbGcv\\XCfSAXUKIVqkPwJbaRTjlpGBxCGXxnchUhRoePYoLE]fexb",
-      "createdAt": "2026-01-07T13:45:46.304Z"
-    },
-    {
-      "title": "hello",
-      "content": "ef[SK^DuSJrKOlieeJHPLLoGgS[ZO\\gk_dWggGZchFewEnwspxJlhCWQ\\aTEKlDj\\a\\xRj\\uJANSkNLwrnPoOxJ[h]CrLppVtoeCEWPXRpCcoNFU`YA\\RPK\\dk\\Jp^fbdmC`Hpuf[ZYExseoPRbAYAaIolQ_mkJKRfrKsthmsBtCZdeQiBhY\\XAodKo_rOeQvtfNtDQB",
-      "createdAt": "2026-01-07T13:45:46.469Z"
-    },
-    {
-      "title": "Test Title from Jest",
-      "content": "This is the content of the test article.",
-      "createdAt": "2026-01-07T13:45:47.311Z"
-    },
-    {
-      "title": "Test Title from Jest",
-      "content": "This is the content of the test article.",
-      "createdAt": "2026-01-07T18:19:21.946Z"
-    },
-    {
-      "title": "Test Title from Jest",
-      "content": "This is the content of the test article.",
-      "createdAt": "2026-01-07T18:21:43.833Z"
-    },
-    {
-      "title": "Test Title from Jest",
-      "content": "This is the content of the test article.",
-      "createdAt": "2026-01-07T18:24:28.968Z"
-    }
-  ]
-}

package/bloginfo.json

@@ -1,3 +0,0 @@
-{
-  "title": "Blog"
-}