@lexho111/plainblog 0.5.9 → 0.5.10

package/Blog.js

@@ -11,6 +11,7 @@ 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);
 
@@ -189,8 +190,7 @@ export default class Blog {
 
       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.writeFile(publicStylePath, finalStyles + `\n/* source-hash: ${srcHash} */`);
@@ -552,8 +552,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/articles.txt

@@ -1,3 +1,11 @@
 {"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"}
+{"title":"Test Title from Jest","content":"This is the content of the test article.","createdAt":"2026-01-08T18:48:23.123Z"}
+{"title":"Test Title from Jest","content":"This is the content of the test article.","createdAt":"2026-01-08T18:50:06.993Z"}
+{"title":"Test Title from Jest","content":"This is the content of the test article.","createdAt":"2026-01-08T18:56:28.369Z"}
+{"title":"Test Title from Jest","content":"This is the content of the test article.","createdAt":"2026-01-08T18:57:53.780Z"}
+{"title":"Test Title from Jest","content":"This is the content of the test article.","createdAt":"2026-01-08T18:58:54.261Z"}
+{"title":"Test Title from Jest","content":"This is the content of the test article.","createdAt":"2026-01-08T19:01:02.613Z"}
+{"title":"Test Title from Jest","content":"This is the content of the test article.","createdAt":"2026-01-08T19:01:30.473Z"}
+{"title":"Test Title from Jest","content":"This is the content of the test article.","createdAt":"2026-01-08T19:03:33.773Z"}

package/bloginfo.json

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

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.10",
   "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{font-family:Arial;font-family:Arial,sans-serif}h1{color:#333}.grid{border:0 solid #000;display:grid;gap:.25rem;grid-template-columns:1fr}.grid article{border:0 solid #ccc;border-radius:4px;min-width:0;overflow-wrap:break-word;padding:.25rem}.grid article h2{color:#353535;margin-bottom:5px}.grid article .datetime{color:#757575;margin:0}.grid article p{margin-bottom:0;margin-top:10px}article a,article a:visited,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%}@media screen and (max-width:1000px){*{font-size:4vw}#wrapper{box-sizing:border-box;max-width:100%;padding:0 10px;width:100%}}
+/* source-hash: a07f631befba4b6bc703f8709f5ef455faafeff4e5f00b62f835576eea7fb529 */

package/test/blog.test.js

@@ -58,13 +58,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:");
   });
 });