@lexho111/plainblog 0.7.3 → 0.7.4

package/Article.js

@@ -1,93 +1,88 @@
-export default class Article {
-  constructor(id, title, content, createdAt) {
-    this.id = id;
-    this.title = title;
-    this.content = content;
-    this.createdAt = new Date(createdAt).getTime();
-  }
-
-  static createNew(title, content, createdAt = new Date()) {
-    const id = this.getNextID(); // Your existing ID generator
-    //const createdAt = new Date();
-    return new Article(id, title, content, createdAt);
-  }
-
-  static nextID = 100;
-  static getNextID() {
-    // TODO fix use nextID from BlogTreeSearch!
-    this.nextID++;
-    return Math.floor(Math.random() * 100000000);
-  }
-
-  getContent() {
-    return this.content;
-  }
-
-  getContentVeryShort() {
-    if (!this.content) return "";
-    if (this.content.length < 50) return this.content;
-    let contentShort = this.content.substring(0, 50);
-    contentShort += "...";
-    return contentShort;
-  }
-
-  getContentShort() {
-    if (!this.content) return "";
-    if (this.content.length < 400) return this.content;
-    let contentShort = this.content.substring(0, 400);
-    contentShort += "...";
-    return contentShort;
-  }
-
-  /**
-   * Returns a JSON-serializable representation of the article.
-   * This method is automatically called by JSON.stringify().
-   */
-  toJSON() {
-    // Return a plain object with the desired properties
-    const date = !isNaN(this.createdAt)
-      ? new Date(this.createdAt).toISOString()
-      : new Date().toISOString();
-    return {
-      id: this.id,
-      title: this.title,
-      content: this.content,
-      createdAt: date,
-    };
-  }
-
-  /**
-   * Returns a JSON-serializable representation of the article.
-   * This method is automatically called by JSON.stringify().
-   */
-  json() {
-    return this.toJSON();
-  }
-
-  getFormattedDate() {
-    const date = new Date(this.createdAt);
-    const year = date.getFullYear();
-    const month = String(date.getMonth() + 1).padStart(2, "0");
-    const day = String(date.getDate()).padStart(2, "0");
-    const hours = String(date.getHours()).padStart(2, "0");
-    const minutes = String(date.getMinutes()).padStart(2, "0");
-    return `${year}/${month}/${day} ${hours}:${minutes}`;
-  }
-
-  toHTML(loggedin = false) {
-    if (this.content == null) return "";
-    const moreButton = this.content.length > 400 ? `<a href="#">more</a>` : "";
-    const buttons = loggedin // prettier-ignore
-      ? `<div class="buttons"><div id="editButton${this.id}" class="btn edit" role="button" tabindex="0" data-action="edit" data-id="${this.id}">edit</div><div id="deleteButton${this.id}" class="btn delete" role="button" tabindex="0" data-action="delete" data-id="${this.id}">delete</div><div id="somethingelseButton${this.id}" class="btn light">something else</div></div>`
-      : "";
-    // prettier-ignore
-    return `<article data-id="${this.id}" data-date="${this.createdAt}">
+export default class Article {
+    constructor(id, title, content, createdAt) {
+        this.id = id;
+        this.title = title;
+        this.content = content;
+        this.createdAt = new Date(createdAt).getTime();
+    }
+    static createNew(title, content, createdAt = new Date()) {
+        const id = this.getNextID(); // Your existing ID generator
+        //const createdAt = new Date();
+        return new Article(id, title, content, createdAt);
+    }
+    static getNextID() {
+        // Generiert eine kollisionssichere ID basierend auf Zeitstempel + Zufall
+        // Passt in JS Safe Integer und SQLite Integer (64-bit)
+        return Date.now() * 1000 + Math.floor(Math.random() * 1000);
+    }
+    getContent() {
+        return this.content;
+    }
+    getContentVeryShort() {
+        if (!this.content)
+            return "";
+        if (this.content.length < 50)
+            return this.content;
+        let contentShort = this.content.substring(0, 50);
+        contentShort += "...";
+        return contentShort;
+    }
+    getContentShort() {
+        if (!this.content)
+            return "";
+        if (this.content.length < 400)
+            return this.content;
+        let contentShort = this.content.substring(0, 400);
+        contentShort += "...";
+        return contentShort;
+    }
+    /**
+     * Returns a JSON-serializable representation of the article.
+     * This method is automatically called by JSON.stringify().
+     */
+    toJSON() {
+        // Return a plain object with the desired properties
+        const date = !isNaN(this.createdAt)
+            ? new Date(this.createdAt).toISOString()
+            : new Date().toISOString();
+        return {
+            id: this.id,
+            title: this.title,
+            content: this.content,
+            createdAt: date,
+        };
+    }
+    /**
+     * Returns a JSON-serializable representation of the article.
+     * This method is automatically called by JSON.stringify().
+     */
+    json() {
+        return this.toJSON();
+    }
+    getFormattedDate() {
+        const date = new Date(this.createdAt);
+        const year = date.getFullYear();
+        const month = String(date.getMonth() + 1).padStart(2, "0");
+        const day = String(date.getDate()).padStart(2, "0");
+        const hours = String(date.getHours()).padStart(2, "0");
+        const minutes = String(date.getMinutes()).padStart(2, "0");
+        return `${year}/${month}/${day} ${hours}:${minutes}`;
+    }
+    toHTML(loggedin = false) {
+        if (this.content == null)
+            return "";
+        const moreButton = this.content.length > 400 ? `<a href="#">more</a>` : "";
+        const buttons = loggedin // prettier-ignore
+            ? `<div class="buttons"><div id="editButton${this.id}" class="btn edit" role="button" tabindex="0" data-action="edit" data-id="${this.id}">edit</div><div id="deleteButton${this.id}" class="btn delete" role="button" tabindex="0" data-action="delete" data-id="${this.id}">delete</div><div id="somethingelseButton${this.id}" class="btn light">something else</div></div>`
+            : "";
+        // prettier-ignore
+        return `<article data-id="${this.id}" data-date="${this.createdAt}">
     ${buttons}
         <h2>${this.title}</h2>
         <span class="datetime">${this.getFormattedDate()}</span>
         <p>${this.getContentShort()}</p>
         <div class="full-content" style="display: none;">${this.content}</div>
         ${moreButton}
-      </article>`;
-  }
-}
+      </article>`;
+    }
+}

package/Article.ts

@@ -0,0 +1,97 @@
+export default class Article {
+  id: number;
+  title: string;
+  content: string;
+  createdAt: number;
+
+  constructor(id: number, title: string, content: string, createdAt: string | number | Date) {
+    this.id = id;
+    this.title = title;
+    this.content = content;
+    this.createdAt = new Date(createdAt).getTime();
+  }
+
+  static createNew(title: string, content: string, createdAt: string | number | Date = new Date()): Article {
+    const id = this.getNextID(); // Your existing ID generator
+    //const createdAt = new Date();
+    return new Article(id, title, content, createdAt);
+  }
+
+  static getNextID(): number {
+    // Generiert eine kollisionssichere ID basierend auf Zeitstempel + Zufall
+    // Passt in JS Safe Integer und SQLite Integer (64-bit)
+    return Date.now() * 1000 + Math.floor(Math.random() * 1000);
+  }
+
+  getContent(): string {
+    return this.content;
+  }
+
+  getContentVeryShort(): string {
+    if (!this.content) return "";
+    if (this.content.length < 50) return this.content;
+    let contentShort = this.content.substring(0, 50);
+    contentShort += "...";
+    return contentShort;
+  }
+
+  getContentShort(): string {
+    if (!this.content) return "";
+    if (this.content.length < 400) return this.content;
+    let contentShort = this.content.substring(0, 400);
+    contentShort += "...";
+    return contentShort;
+  }
+
+  /**
+   * Returns a JSON-serializable representation of the article.
+   * This method is automatically called by JSON.stringify().
+   */
+  toJSON(): { id: number; title: string; content: string; createdAt: string } {
+    // Return a plain object with the desired properties
+    const date = !isNaN(this.createdAt)
+      ? new Date(this.createdAt).toISOString()
+      : new Date().toISOString();
+    return {
+      id: this.id,
+      title: this.title,
+      content: this.content,
+      createdAt: date,
+    };
+  }
+
+  /**
+   * Returns a JSON-serializable representation of the article.
+   * This method is automatically called by JSON.stringify().
+   */
+  json(): { id: number; title: string; content: string; createdAt: string } {
+    return this.toJSON();
+  }
+
+  getFormattedDate(): string {
+    const date = new Date(this.createdAt);
+    const year = date.getFullYear();
+    const month = String(date.getMonth() + 1).padStart(2, "0");
+    const day = String(date.getDate()).padStart(2, "0");
+    const hours = String(date.getHours()).padStart(2, "0");
+    const minutes = String(date.getMinutes()).padStart(2, "0");
+    return `${year}/${month}/${day} ${hours}:${minutes}`;
+  }
+
+  toHTML(loggedin = false): string {
+    if (this.content == null) return "";
+    const moreButton = this.content.length > 400 ? `<a href="#">more</a>` : "";
+    const buttons = loggedin // prettier-ignore
+      ? `<div class="buttons"><div id="editButton${this.id}" class="btn edit" role="button" tabindex="0" data-action="edit" data-id="${this.id}">edit</div><div id="deleteButton${this.id}" class="btn delete" role="button" tabindex="0" data-action="delete" data-id="${this.id}">delete</div><div id="somethingelseButton${this.id}" class="btn light">something else</div></div>`
+      : "";
+    // prettier-ignore
+    return `<article data-id="${this.id}" data-date="${this.createdAt}">
+    ${buttons}
+        <h2>${this.title}</h2>
+        <span class="datetime">${this.getFormattedDate()}</span>
+        <p>${this.getContentShort()}</p>
+        <div class="full-content" style="display: none;">${this.content}</div>
+        ${moreButton}
+      </article>`;
+  }
+}

package/AssetManager.js

@@ -4,6 +4,7 @@ import path from "path";
 import { fileURLToPath } from "url";
 import { Worker } from "node:worker_threads";
 import { createDebug } from "./debug-loader.js";
+import { checkSourceCSS } from "./modules/csscompiler/csscompiler.js";
 
 const debug = createDebug("plainblog:AssetManager");
 const __filename = fileURLToPath(import.meta.url);
@@ -13,27 +14,30 @@ export default class AssetManager {
   constructor() {
     this.publicDir = path.join(process.cwd(), "public");
     this.reloadStylesOnGET = false;
-    this.stylesheetPath = null;
+    this._stylesheetPath = null;
     this.compilestyle = false;
-    this.styles = "";
-    this.compiledStyles = "";
-    this.stylesHash = "";
+    this._styles = "";
     this.scriptsHash = "";
   }
 
-  setStyle(style) {
-    this.styles += style;
+  set style(value) {
+    debug("set style %s", value);
+    this._styles += value;
     this.compilestyle = true;
   }
 
+  set stylesheetPath(value) {
+    debug(`set Stylesheet path: ${value}`);
+    this._stylesheetPath = value;
+  }
+
+  get stylesheetPath() {
+    return this._stylesheetPath;
+  }
+
   async init() {
-    // if there is a stylesheet path provided, process it
-    if (this.stylesheetPath != null && this.compilestyle) {
-      await this.processStylesheets(this.stylesheetPath);
-    }
-    if (!this.stylesheetPath) {
-      await this.processDefaultStyles();
-    }
+    debug("init");
+    await this.processStyles();
 
     // Process Scripts
     const srcScriptPath = path.join(__dirname, "src", "fetchData.js");
@@ -42,112 +46,35 @@ export default class AssetManager {
 
   async reload() {
     debug("reload");
-    if (this.stylesheetPath != null && this.compilestyle) {
-      await this.processStylesheets(this.stylesheetPath);
-    }
-    if (!this.stylesheetPath) {
-      await this.processDefaultStyles();
-    }
+    await this.processStyles();
     const srcScriptPath = path.join(__dirname, "src", "fetchData.js");
     await this.processScripts(srcScriptPath);
   }
 
-  async processDefaultStyles() {
-    // compile and merge hardcoded styles in "this.styles" with "src/styles.css"
-    const srcStylePath = path.join(__dirname, "src", "styles.css");
-    const publicStylePath = path.join(this.publicDir, "styles.min.css");
-
-    let publicHash = null;
-    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) => {
-          if (err.code !== "ENOENT" && !err.message.includes("ENOENT"))
-            console.error(err);
-        }),
-      fs.promises
-        .readFile(srcStylePath, "utf8")
-        .then((content) => {
-          srcStyles = content;
-        })
-        .catch((err) => {
-          if (err.code !== "ENOENT" && !err.message.includes("ENOENT"))
-            console.error(err);
-        }),
-    ]);
-
-    const combinedStyles = srcStyles + "\n" + this.styles;
-    const srcHash = crypto
-      .createHash("sha256")
-      .update(combinedStyles)
-      .digest("hex");
-
-    if (srcHash !== publicHash) {
-      debug("Styles have changed. Recompiling in worker...");
-      const finalStyles = await this.runWorker("mergeStyles", [
-        srcStyles,
-        this.styles,
-      ]);
-
-      try {
-        await fs.promises.mkdir(path.dirname(publicStylePath), {
-          recursive: true,
-        });
-        await fs.promises.writeFile(
-          publicStylePath,
-          finalStyles + `\n/* source-hash: ${srcHash} */`,
+  async processStyles(compilerOptions = {}) {
+    let resolvedStylesheetPath = this.stylesheetPath;
+    if (resolvedStylesheetPath) {
+      if (Array.isArray(resolvedStylesheetPath)) {
+        resolvedStylesheetPath = resolvedStylesheetPath.map((p) =>
+          path.isAbsolute(p) ? p : path.resolve(process.cwd(), p),
         );
-      } catch (err) {
-        console.error("Failed to write styles to public folder:", err);
-      }
-    }
-  }
-
-  async processStylesheets(files) {
-    debug("process stylesheets");
-    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"),
-    );
-
-    if (styleFiles.length > 0) {
-      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!");
-          return { path: f, content };
-        }),
-      );
-
-      const hash = crypto.createHash("sha256");
-      for (const file of fileData) hash.update(file.content);
-      const currentHash = hash.digest("hex");
-
-      if (currentHash !== this.stylesHash && this.compilestyle) {
-        console.log("style assets have changed. recompiling in worker...");
-        this.stylesHash = currentHash;
-        this.compiledStyles = await this.runWorker("styles", fileData);
-
-        await fs.promises.mkdir(this.publicDir, { recursive: true });
-        await fs.promises.writeFile(
-          path.join(this.publicDir, "styles.min.css"),
-          this.compiledStyles + `\n/* source-hash: ${currentHash} */`,
+      } else if (
+        typeof resolvedStylesheetPath === "string" &&
+        !path.isAbsolute(resolvedStylesheetPath)
+      ) {
+        resolvedStylesheetPath = path.resolve(
+          process.cwd(),
+          resolvedStylesheetPath,
         );
-      } else {
-        console.log("styles are up-to-date");
       }
     }
+    await checkSourceCSS({
+      stylesheetPath: resolvedStylesheetPath,
+      style: this._styles,
+      outputDir: this.publicDir,
+      outputPath: path.join(this.publicDir, "styles.min.css"),
+      ...compilerOptions,
+    });
   }
 
   async processScripts(files) {
@@ -184,14 +111,28 @@ export default class AssetManager {
       }
 
       if (currentHash !== this.scriptsHash) {
-        console.log("script assets have changed. recompiling in worker...");
-        this.scriptsHash = currentHash;
-        const compiledScripts = await this.runWorker("scripts", fileData);
+        console.log("script assets have changed. recompiling...");
+        let compiledScripts;
+        let success = false;
+        try {
+          compiledScripts = await this.runWorker("scripts", fileData);
+          success = true;
+          this.scriptsHash = currentHash;
+        } catch (e) {
+          console.warn(
+            "Script compilation failed (using fallback):",
+            e.message,
+          );
+          compiledScripts = fileData.map((f) => f.content).join(";\n");
+        }
 
         await fs.promises.mkdir(this.publicDir, { recursive: true });
+        const content = success
+          ? compiledScripts + `\n/* source-hash: ${currentHash} */`
+          : compiledScripts;
         await fs.promises.writeFile(
           path.join(this.publicDir, "scripts.min.js"),
-          compiledScripts + `\n/* source-hash: ${currentHash} */`,
+          content,
         );
       }
     }
@@ -205,11 +146,17 @@ export default class AssetManager {
           : { type, fileData: data };
 
       const worker = new Worker(
-        path.resolve(__dirname, "workers", "compiler-worker.js"),
+        path.resolve(
+          __dirname,
+          "modules",
+          "jscompiler",
+          "compile-js-worker.js",
+        ),
         { workerData },
       );
       worker.on("message", (msg) => {
         if (msg.status === "success") {
+          console.log("compilation complete: public/styles.min.css created");
           resolve(msg.result);
         } else {
           reject(new Error(msg.error));

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,11 +160,18 @@ export default class Blog {
 
   /** initializes database */
   async init() {
-    if (this.#initPromise) return this.#initPromise;
+    //if (this.#initPromise) return this.#initPromise;
 
     this.#initPromise = (async () => {
       try {
-        await this.assetManager.init();
+        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");

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/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/SqliteAdapter.js

@@ -32,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;
         }