@lexho111/plainblog 0.7.2 → 0.7.4

package/Blog.js

@@ -123,13 +123,13 @@ export default class Blog {
    * @param {string} style - A string containing CSS rules.
    */
   set style(style) {
-    debug("set style");
-    this.assetManager.styles = style;
+    debug("set style %s", style);
+    this.assetManager.style = style;
     this.assetManager.compilestyle = true;
   }
 
   get style() {
-    return this.assetManager.styles;
+    return this.assetManager._styles;
   }
 
   /**
@@ -137,8 +137,8 @@ export default class Blog {
    * @param {string|string[]} files - A single file path or an array of file paths.
    */
   set stylesheetPath(files) {
+    debug(`set stylesheet path: ${files}`);
     this.assetManager.stylesheetPath = files;
-    console.log(`this.assetManager.stylesheetPath: ${files}`);
     this.assetManager.compilestyle = true;
   }
 
@@ -160,77 +160,98 @@ export default class Blog {
 
   /** initializes database */
   async init() {
-    if (this.#initPromise) return this.#initPromise;
+    //if (this.#initPromise) return this.#initPromise;
 
     this.#initPromise = (async () => {
-      await this.assetManager.init();
+      try {
+        try {
+          await this.assetManager.init();
+        } catch (e) {
+          console.warn(
+            "Warning: AssetManager initialization failed. Styles may not be compiled.",
+            e.message,
+          );
+        }
 
-      if (this.#isExternalAPI) {
-        console.log("external API");
-        await this.#loadFromAPI();
-      } else {
-        debug(`database: ${this.database.type}`);
-        if (!this.#databaseModel) {
-          if (this.database.type === "file") {
-            this.#databaseModel = new DatabaseModel(
-              new WorkerAdapter(this.database),
+        if (this.#isExternalAPI) {
+          console.log("external API");
+          await this.#loadFromAPI();
+        } else {
+          debug(`database: ${this.database.type}`);
+          if (!this.#databaseModel) {
+            if (this.database.type === "file") {
+              this.#databaseModel = new DatabaseModel(
+                new WorkerAdapter(this.database),
+              );
+            } else if (this.database.type === "sqlite") {
+              this.#databaseModel = new DatabaseModel(
+                new SqliteAdapter(this.database),
+              );
+            }
+          }
+          // Timeout nach 60 Sekunden, um Hängenbleiben zu verhindern
+          let timeoutHandle;
+          const timeout = new Promise((_, reject) => {
+            timeoutHandle = setTimeout(
+              () => reject(new Error("Database initialization timed out")),
+              60000,
             );
-          } else if (this.database.type === "sqlite") {
-            this.#databaseModel = new DatabaseModel(
-              new SqliteAdapter(this.database),
+          });
+          try {
+            await Promise.race([this.#databaseModel.initialize(), timeout]);
+          } finally {
+            clearTimeout(timeoutHandle); // Timer aufräumen, sobald fertig
+          }
+
+          if (this.#databaseModel.isReady()) {
+            console.log(`connected to database`);
+            console.log(
+              `using ${this.#databaseModel.getType()} database '${this.#databaseModel.getDBName()}'`,
             );
           }
+          this.#articles.setDatabase(this.#databaseModel);
+          const [dbTitle, dbArticles] = await Promise.all([
+            this.#databaseModel.getBlogTitle(),
+            this.#databaseModel.findAll(-1),
+          ]);
+          debug("dbArticles.size(): %d", dbArticles.length);
+          //log(filename, "dbArticles.size(): " + dbArticles.length);
+          //log(filename, "dbArticles.size(): " + dbArticles.length, "Blog.js");
+          debug("all articles in Blog after loading from db");
+
+          // Displays a beautiful table in the console
+          //table(dbArticles)
+
+          if (dbArticles.length == 0) {
+            dbArticles.push(
+              new Article(
+                1,
+                "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(
+                2,
+                "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.assetManager.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
+          else title = dbTitle; // use title from the database
+          const responseData = { title: title, articles: dbArticles };
+          this.#applyBlogData(responseData);
         }
-        const p = this.#databaseModel.initialize();
-        while (!this.#databaseModel.isReady()) {
-          await new Promise((resolve) => setTimeout(resolve, 100));
-        }
-        if (this.#databaseModel.isReady()) {
-          console.log(`connected to database`);
-          console.log(
-            `using ${this.#databaseModel.getType()} database '${this.#databaseModel.getDBName()}'`,
-          );
-        }
-        await p;
-        this.#articles.setDatabase(this.#databaseModel);
-        const [dbTitle, dbArticles] = await Promise.all([
-          this.#databaseModel.getBlogTitle(),
-          this.#databaseModel.findAll(-1),
-        ]);
-        debug("dbArticles.size(): %d", dbArticles.length);
-        //log(filename, "dbArticles.size(): " + dbArticles.length);
-        //log(filename, "dbArticles.size(): " + dbArticles.length, "Blog.js");
-        debug("all articles in Blog after loading from db");
-
-        // Displays a beautiful table in the console
-        //table(dbArticles)
-
-        if (dbArticles.length == 0) {
-          dbArticles.push(
-            new Article(
-              1,
-              "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(
-              2,
-              "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.assetManager.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
-        else title = dbTitle; // use title from the database
-        const responseData = { title: title, articles: dbArticles };
-        this.#applyBlogData(responseData);
+      } catch (err) {
+        this.#initPromise = null; // Reset promise on error to allow retry
+        throw err;
       }
     })();
     return this.#initPromise;
@@ -267,11 +288,6 @@ export default class Blog {
   /** start a http server with default port 8080 */
   async startServer(port = 8080) {
     await this.init();
-    // is database ready
-    while (this.#databaseModel && !this.#databaseModel.isReady()) {
-      await new Promise((resolve) => setTimeout(resolve, 100));
-      //console.log("is not ready;");
-    }
 
     this.#server = await createServer(
       this.postArticle.bind(this),
@@ -285,14 +301,16 @@ export default class Blog {
       this.database,
     );
 
-    await new Promise((resolve, reject) => {
-      const errorHandler = (err) => reject(err);
-      this.#server.once("error", errorHandler);
-      this.#server.listen(port, "0.0.0.0", () => {
-        this.#server.removeListener("error", errorHandler);
-        resolve();
-      });
-    });
+    await new Promise(
+      function f1(resolve, reject) {
+        const errorHandler = (err) => reject(err);
+        this.#server.once("error", errorHandler);
+        this.#server.listen(port, "0.0.0.0", () => {
+          this.#server.removeListener("error", errorHandler);
+          resolve();
+        });
+      }.bind(this),
+    );
     console.log(`server running at http://localhost:${port}/`);
   }
 
@@ -363,7 +381,10 @@ export default class Blog {
 
   /** render this blog content to valid html */
   async toHTML(loggedin) {
-    const articles_after = await this.#articles.findAll(null, null, 50);
+    let articles_after = this.#articles.findAll(null, null, 50);
+    if (articles_after instanceof Promise) {
+      articles_after = await articles_after;
+    }
     // prettier-ignore
     debug("fetched %d articles", articles_after.length);
     const data = {

package/cluster-server.js

@@ -1,44 +1,49 @@
 import cluster from "cluster";
 import os from "os";
 import process from "node:process";
+import { fileURLToPath } from "url";
 import Blog from "./Blog.js";
 
-const numCPUs = os.cpus().length;
+export function startCluster(port = process.env.PORT || 8080) {
+  const numCPUs = os.cpus().length;
 
-if (cluster.isPrimary) {
-  console.log(`master ${process.pid} is running`);
+  if (cluster.isPrimary) {
+    console.log(`master ${process.pid} is running`);
 
-  // Fork workers (one per CPU core)
-  for (let i = 0; i < numCPUs; i++) {
-    cluster.fork();
-  }
+    // Fork workers (one per CPU core)
+    for (let i = 0; i < numCPUs; i++) {
+      cluster.fork();
+    }
 
-  cluster.on("exit", (worker, code, signal) => {
-    console.log(
-      `worker ${worker.process.pid} died (${signal || code}). restarting...`,
-    );
-    cluster.fork(); // Restart dead worker
-  });
-} else {
-  // Worker process
-  const blog = new Blog();
+    cluster.on("exit", (worker, code, signal) => {
+      console.log(
+        `worker ${worker.process.pid} died (${signal || code}). restarting...`,
+      );
+      cluster.fork(); // Restart dead worker
+    });
+  } else {
+    // Worker process
+    const blog = new Blog();
 
-  const port = process.env.PORT || 8080;
+    blog
+      .startServer(port)
+      .then(() => {
+        console.log(`worker ${process.pid} started on port ${port}`);
+      })
+      .catch((err) => {
+        console.error(`Worker ${process.pid} failed to start:`, err);
+        process.exit(1);
+      });
 
-  blog
-    .startServer(port)
-    .then(() => {
-      console.log(`worker ${process.pid} started on port ${port}`);
-    })
-    .catch((err) => {
-      console.error(`Worker ${process.pid} failed to start:`, err);
-      process.exit(1);
+    // Graceful shutdown
+    process.on("SIGTERM", async () => {
+      console.log(`worker ${process.pid} shutting down...`);
+      await blog.closeServer();
+      process.exit(0);
     });
+  }
+}
 
-  // Graceful shutdown
-  process.on("SIGTERM", async () => {
-    console.log(`worker ${process.pid} shutting down...`);
-    await blog.closeServer();
-    process.exit(0);
-  });
+if (process.argv[1] === fileURLToPath(import.meta.url)) {
+  startCluster();
 }

package/debug-loader.js

@@ -27,14 +27,29 @@ export function createDebug(namespace) {
 
 const debug_perf_ns = createDebug("plainblog:performance");
 export function debug_perf(message, duration) {
+  let duration_rounded = duration.toFixed(2);
+  debug_perf_ns(message.padEnd(35) + " took " + duration_rounded + "ms");
   const threshold = 25;
   if (duration > threshold) {
     debug_perf_ns(message + ` WARNING! threshold > ${threshold}ms reached!`);
   }
 }
 
+export async function measure_perf(message, fn) {
+  const start = performance.now();
+  try {
+    return await fn();
+  } finally {
+    const duration = performance.now() - start;
+    debug_perf(message, duration);
+  }
+}
+
 export function debug_perf1(message, duration, threshold) {
   if (duration > threshold) {
-    debug_perf_ns(message + ` WARNING! threshold > ${threshold}ms reached!`);
+    debug_perf_ns(
+      message +
+        ` took ${duration}ms. WARNING! threshold > ${threshold}ms reached!`,
+    );
   }
 }

package/index.js

@@ -4,6 +4,7 @@ import FileAdapter from "./model/FileAdapter.js";
 import PostgresAdapter from "./model/PostgresAdapter.js";
 import SequelizeAdapter from "./model/SequelizeAdapter.js";
 import SqliteAdapter from "./model/SqliteAdapter.js";
+import { startCluster } from "./cluster-server.js";
 
 export {
   Blog,
@@ -12,5 +13,6 @@ export {
   SequelizeAdapter,
   FileAdapter,
   SqliteAdapter,
+  startCluster,
 };
 export default Blog;

package/model/DataModel.js

@@ -56,7 +56,7 @@ export default class DataModel {
     return this.storage.getAllArticles(order);
   }
 
-  async findAll(start, end, limit) {
+  findAll(start, end, limit) {
     debug("find all %d %d %d", start, end, limit);
     if (start == null && end == null && limit == null)
       return this.getAllArticles();
@@ -64,15 +64,17 @@ export default class DataModel {
     let articles = this.storage.getRange(start, end, limit);
 
     if (articles.length < limit && this.db) {
-      const dbArticles = await this.db.findAll(limit, 0, start, end);
-      for (const data of dbArticles) {
-        if (!this.storage.contains(data.id)) {
-          this.storage.insert(
-            new Article(data.id, data.title, data.content, data.createdAt),
-          );
+      return (async () => {
+        const dbArticles = await this.db.findAll(limit, 0, start, end);
+        for (const data of dbArticles) {
+          if (!this.storage.contains(data.id)) {
+            this.storage.insert(
+              new Article(data.id, data.title, data.content, data.createdAt),
+            );
+          }
         }
-      }
-      articles = this.storage.getRange(start, end, limit);
+        return this.storage.getRange(start, end, limit);
+      })();
     }
     return articles;
   }

package/model/SqliteAdapter.js

@@ -13,6 +13,7 @@ export default class SqliteAdapter {
     this.db = null;
     this.initPromise = null;
     this.ready = false;
+    this.stmts = {};
   }
 
   async initialize() {
@@ -31,7 +32,7 @@ export default class SqliteAdapter {
           console.error(
             "The 'better-sqlite3' package is not installed. Please install it by running: npm install better-sqlite3",
           );
-          throw new Error("Missing optional dependency: 'better-sqlite3'");
+          process.exit(1);
         } else {
           throw error;
         }
@@ -86,16 +87,23 @@ export default class SqliteAdapter {
     return this.dbname;
   }
 
+  getStmt(sql) {
+    if (!this.stmts[sql]) {
+      this.stmts[sql] = this.db.prepare(sql);
+    }
+    return this.stmts[sql];
+  }
+
   async getBlogTitle() {
     debug("getBlogTitle dbname: %s", this.dbname);
     if (!this.db) await this.initialize();
-    const row = this.db.prepare("SELECT title FROM BlogInfos LIMIT 1").get();
+    const row = this.getStmt("SELECT title FROM BlogInfos LIMIT 1").get();
     return row ? row.title : "Blog";
   }
 
   async updateBlogTitle(newTitle) {
     if (!this.db) await this.initialize();
-    this.db.prepare("UPDATE BlogInfos SET title = ?").run(newTitle);
+    this.getStmt("UPDATE BlogInfos SET title = ?").run(newTitle);
   }
 
   async save(newArticle) {
@@ -106,7 +114,7 @@ export default class SqliteAdapter {
       : new Date().toISOString();
     const updatedAt = new Date().toISOString();
 
-    const stmt = this.db.prepare(
+    const stmt = this.getStmt(
       `INSERT INTO Articles (id, title, content, createdAt, updatedAt)
        VALUES (@id, @title, @content, @createdAt, @updatedAt)`,
     );
@@ -150,13 +158,13 @@ export default class SqliteAdapter {
 
     if (sets.length > 1) {
       const sql = `UPDATE Articles SET ${sets.join(", ")} WHERE id = @id`;
-      this.db.prepare(sql).run(params);
+      this.getStmt(sql).run(params);
     }
   }
 
   async remove(id) {
     if (!this.db) await this.initialize();
-    this.db.prepare("DELETE FROM Articles WHERE id = ?").run(id);
+    this.getStmt("DELETE FROM Articles WHERE id = ?").run(id);
   }
 
   async findAll(
@@ -195,7 +203,7 @@ export default class SqliteAdapter {
       params.push(offset);
     }
 
-    const rows = this.db.prepare(query).all(...params);
+    const rows = this.getStmt(query).all(...params);
     return rows.map((row) => ({
       ...row,
       createdAt: new Date(row.createdAt),

package/model/datastructures/BinarySearchTree.js

@@ -69,7 +69,7 @@ export class BinarySearchTree {
     );
     const time_end = performance.now();
     const duration = time_end - time_start;
-    debug_perf("BST took " + duration + "ms", duration);
+    debug_perf("BST", duration);
     return result;
   }
 

package/modules/csscompiler/compile-style-worker.js

@@ -0,0 +1,72 @@
+import { parentPort, workerData } from "worker_threads";
+import fs from "fs";
+
+export async function run(
+  baseContent,
+  extraContent = "",
+  inlineContent = "",
+  options = {},
+) {
+  const { forceFallback = false, disableFallback = false } = options;
+  let finalStyles = baseContent + "\n" + extraContent + "\n" + inlineContent;
+
+  // postcss, autoprefixer, cssnano installed?
+  if (!forceFallback) {
+    try {
+      const { default: postcss } = await import("postcss");
+      const { default: autoprefixer } = await import("autoprefixer");
+      const { default: cssnano } = await import("cssnano");
+
+      const result = await postcss([autoprefixer, cssnano]).process(
+        finalStyles,
+        {
+          from: undefined,
+        },
+      );
+      return result.css;
+    } catch (e) {
+      // no --> print "please install postcss, autoprefixer, cssnano"
+      console.log(
+        "please run 'npm install postcss autoprefixer cssnano' for full feature support.",
+      );
+    }
+  }
+
+  // fallback-minify
+  if (!disableFallback) {
+    finalStyles = finalStyles
+      .replace(/\/\*[\s\S]*?\*\//g, "")
+      .replace(/\s*([:;{}])\s*/g, "$1")
+      .replace(/}\s+/g, "}")
+      .replace(/;}/g, "}")
+      .trim();
+  }
+  return finalStyles;
+}
+
+// compile
+if (parentPort && workerData && workerData.outputPath) {
+  const {
+    baseContent,
+    extraContent,
+    inlineContent,
+    outputPath,
+    forceFallback,
+    disableFallback,
+  } = workerData;
+
+  (async () => {
+    try {
+      const finalStyles = await run(baseContent, extraContent, inlineContent, {
+        forceFallback,
+        disableFallback,
+      });
+      // generate 'public/styles.min.css'
+      fs.writeFileSync(outputPath, finalStyles);
+
+      parentPort.postMessage("success");
+    } catch (error) {
+      parentPort.postMessage({ error: error.message });
+    }
+  })();
+}