@lexho111/plainblog 0.6.11 → 0.6.13

package/ArrayList.cpuprofile

@@ -0,0 +1 @@
+{"nodes":[{"id":1,"callFrame":{"functionName":"(root)","scriptId":"0","url":"","lineNumber":-1,"columnNumber":-1},"hitCount":0,"children":[2]},{"id":2,"callFrame":{"functionName":"processTicksAndRejections","scriptId":"31","url":"node:internal/process/task_queues","lineNumber":70,"columnNumber":34},"hitCount":0,"children":[3]},{"id":3,"callFrame":{"functionName":"runSearch","scriptId":"165","url":"file:///C:/Users/alexh/Documents/plainblog/package/profile-bst.js","lineNumber":11,"columnNumber":24},"hitCount":2,"children":[4,6,7],"positionTicks":[{"line":38,"ticks":2}]},{"id":4,"callFrame":{"functionName":"","scriptId":"165","url":"file:///C:/Users/alexh/Documents/plainblog/package/profile-bst.js","lineNumber":31,"columnNumber":20},"hitCount":0,"children":[5]},{"id":5,"callFrame":{"functionName":"post","scriptId":"108","url":"node:inspector","lineNumber":114,"columnNumber":6},"hitCount":0},{"id":6,"callFrame":{"functionName":"getRange","scriptId":"167","url":"file:///C:/Users/alexh/Documents/plainblog/package/model/datastructures/ArrayList.js","lineNumber":64,"columnNumber":16},"hitCount":9,"positionTicks":[{"line":83,"ticks":4},{"line":83,"ticks":1},{"line":85,"ticks":3},{"line":83,"ticks":1}]},{"id":7,"callFrame":{"functionName":"","scriptId":"165","url":"file:///C:/Users/alexh/Documents/plainblog/package/profile-bst.js","lineNumber":39,"columnNumber":20},"hitCount":0,"children":[8]},{"id":8,"callFrame":{"functionName":"post","scriptId":"108","url":"node:inspector","lineNumber":114,"columnNumber":6},"hitCount":0,"children":[9]},{"id":9,"callFrame":{"functionName":"dispatch","scriptId":"0","url":"","lineNumber":-1,"columnNumber":-1},"hitCount":1,"positionTicks":[{"line":139,"ticks":1}]}],"startTime":1715759778061,"endTime":1715763735963,"samples":[5,6,3,6,6,6,6,6,6,6,6,6,6,3,9],"timeDeltas":[3939197,1797,1542,1458,1498,1489,1511,506,1007,1507,1835,1295,853,497,1509]}

package/Article.js

@@ -24,20 +24,41 @@ export default class Article {
   }
 
   getContentVeryShort() {
-    if (!this.content) return;
-    if (this.content.length < 50) return this.getContent();
+    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.length < 400) return this.getContent();
+    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
+    let date = new Date();
+    try {
+      date = new Date(this.createdAt).toISOString();
+    } catch (err) {
+      console.error(err);
+    }
+    return {
+      id: this.id,
+      title: this.title,
+      content: this.content,
+      createdAt: date,
+    };
+  }
+
   getFormattedDate() {
     const date = new Date(this.createdAt);
     const year = date.getFullYear();
@@ -51,48 +72,8 @@ export default class Article {
   toHTML(loggedin = false) {
     if (this.content == null) return "";
     const moreButton = this.content.length > 400 ? `<a href="#">more</a>` : "";
-    const buttons = loggedin
-      ? `<div class="buttons"><div id="editButton${this.id}" class="btn edit">edit</div><div id="deleteButton${this.id}" class="btn delete">delete</div><div id="somethingelseButton${this.id}" class="btn light">something else</div></div>`
-      : "";
-    const script = loggedin
-      ? `<script>
-      if (typeof window.handleAction !== 'function') {
-        window.handleAction = function(action, id) {
-          if (action === 'delete') {
-             if (confirm("Delete this article?")) {
-                fetch("/api/articles?id=" + id, { method: "DELETE" })
-                .then(res => { if(res.ok) window.location.reload(); else alert("Error: " + res.statusText); });
-             }
-          } else if (action === 'edit') {
-             const title = prompt("New Title");
-             const content = prompt("New Content");
-             if (title && content) {
-                fetch("/api/articles?id=" + id, {
-                    method: "PUT",
-                    body: JSON.stringify({ title, content })
-                }).then(res => { if(res.ok) window.location.reload(); else alert("Error: " + res.statusText); });
-             }
-          }
-        }
-      }
-      function clickListener(button) {
-      const mybutton = document.getElementById(button);
-      const action = button.includes("edit") ? "edit" : "delete";
-
-// Mouse/Touch support
-mybutton.addEventListener('click', () => window.handleAction(action, ${this.id}));
-
-// Keyboard support
-mybutton.addEventListener('keydown', (event) => {
-  if (event.key === 'Enter' || event.key === ' ') {
-    event.preventDefault(); // Prevents page scrolling on Space
-    window.handleAction(action, ${this.id});
-  }
-});
-  }
-clickListener("editButton${this.id}");
-clickListener("deleteButton${this.id}");
-      </script>`
+    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}">
@@ -101,7 +82,6 @@ clickListener("deleteButton${this.id}");
         <span class="datetime">${this.getFormattedDate()}</span>
         <p>${this.getContentShort()}</p>
         ${moreButton}
-      ${script}
       </article>`;
   }
 }

package/BinarySearchTree.cpuprofile

@@ -0,0 +1 @@
+{"nodes":[{"id":1,"callFrame":{"functionName":"(root)","scriptId":"0","url":"","lineNumber":-1,"columnNumber":-1},"hitCount":0,"children":[2]},{"id":2,"callFrame":{"functionName":"processTicksAndRejections","scriptId":"31","url":"node:internal/process/task_queues","lineNumber":70,"columnNumber":34},"hitCount":0,"children":[3]},{"id":3,"callFrame":{"functionName":"runSearch","scriptId":"165","url":"file:///C:/Users/alexh/Documents/plainblog/package/profile-bst.js","lineNumber":11,"columnNumber":24},"hitCount":0,"children":[4,6]},{"id":4,"callFrame":{"functionName":"","scriptId":"165","url":"file:///C:/Users/alexh/Documents/plainblog/package/profile-bst.js","lineNumber":31,"columnNumber":20},"hitCount":0,"children":[5]},{"id":5,"callFrame":{"functionName":"post","scriptId":"108","url":"node:inspector","lineNumber":114,"columnNumber":6},"hitCount":0},{"id":6,"callFrame":{"functionName":"","scriptId":"165","url":"file:///C:/Users/alexh/Documents/plainblog/package/profile-bst.js","lineNumber":39,"columnNumber":20},"hitCount":0,"children":[7]},{"id":7,"callFrame":{"functionName":"post","scriptId":"108","url":"node:inspector","lineNumber":114,"columnNumber":6},"hitCount":0,"children":[8]},{"id":8,"callFrame":{"functionName":"dispatch","scriptId":"0","url":"","lineNumber":-1,"columnNumber":-1},"hitCount":1,"positionTicks":[{"line":139,"ticks":1}]}],"startTime":1715784018183,"endTime":1715790062379,"samples":[5,8],"timeDeltas":[6035769,7757]}

package/Blog.js

@@ -6,6 +6,7 @@ import process from "node:process";
 import path from "path";
 import { fileURLToPath } from "url";
 import pkg from "./package.json" with { type: "json" };
+import { Buffer } from "node:buffer";
 import Article from "./Article.js";
 import DatabaseModel from "./model/DatabaseModel.js";
 import { fetchData, postData } from "./model/APIModel.js";
@@ -56,7 +57,7 @@ export default class Blog {
   }
 
   /** @returns a json representation of the blog */
-  json() {
+  toJSON() {
     const serverInfo = this.#server
       ? {
           listening: this.#server.listening,
@@ -80,6 +81,11 @@ export default class Blog {
     return JSON.parse(JSON.stringify(json)); // make json read-only
   }
 
+  /** @returns a json representation of the blog */
+  json() {
+    return this.toJSON();
+  }
+
   // Private fields
   #version = null;
   #server = null;
@@ -171,19 +177,29 @@ export default class Blog {
 
   async #readBody(req) {
     return new Promise((resolve, reject) => {
-      let data = "";
-      req.on("data", (chunk) => (data += chunk.toString()));
-      req.on("end", () => resolve(data));
-      req.on("error", reject);
+      const chunks = [];
+
+      req.on("data", (chunk) => {
+        chunks.push(chunk);
+      });
+
+      req.on("end", () => {
+        const data = Buffer.concat(chunks).toString();
+        resolve(data);
+      });
+
+      req.on("error", (err) => {
+        reject(err);
+      });
     });
   }
 
   async #handleLogin(req, res) {
     debug("handle login");
     const body = await new Promise((resolve, reject) => {
-      let data = "";
-      req.on("data", (chunk) => (data += chunk.toString()));
-      req.on("end", () => resolve(data));
+      const chunks = [];
+      req.on("data", (chunk) => chunks.push(chunk));
+      req.on("end", () => resolve(Buffer.concat(chunks).toString()));
       req.on("error", reject);
     });
     const params = new URLSearchParams(body);
@@ -263,7 +279,9 @@ export default class Blog {
               );
               if (match) publicHash = match[1];
             })
-            .catch((err) => console.error(err)), // public/styles.min.css doesn't exist, will be created.
+            .catch((err) => {
+              if (err.code !== "ENOENT") console.error(err);
+            }), // public/styles.min.css doesn't exist, will be created.
           fs.promises
             .readFile(srcStylePath, "utf8")
             .then((content) => {
@@ -307,14 +325,14 @@ export default class Blog {
         console.log("external API");
         await this.#loadFromAPI();
       } else {
-        console.log(`database: ${this.database.type}`);
+        debug(`database: ${this.database.type}`);
         if (!this.#databaseModel) {
           if (this.database.type === "file") {
             const adapter = new FileAdapter(this.database);
             this.#databaseModel = new DatabaseModel(adapter);
           }
         }
-        console.log(`connected to database`);
+        debug(`connected to database`);
         await this.#databaseModel.initialize();
         this.#articles.setDatabase(this.#databaseModel);
         const [dbTitle, dbArticles] = await Promise.all([
@@ -364,16 +382,21 @@ export default class Blog {
   async postArticle(newArticle) {
     try {
       // Save the new article to the database via the ApiServer
-      const promises = [];
-      //if (this.#databaseModel)
-      //  promises.push(this.#databaseModel.save(newArticle));
-      if (this.#isExternalAPI)
-        promises.push(postData(this.#apiUrl, newArticle));
-      await Promise.all(promises);
-      const title = newArticle.title;
-      const content = newArticle.content;
+      if (this.#isExternalAPI) {
+        await postData(this.#apiUrl, newArticle);
+      }
+
+      // The article is already saved to the DB, just add it to the in-memory cache.
+      // Ensure it's an Article instance.
+      const article = new Article(
+        newArticle.id,
+        newArticle.title,
+        newArticle.content,
+        newArticle.createdAt,
+      );
+
       // Add the article to the local list for immediate display
-      this.#articles.insert(Article.createNew(title, content));
+      this.#articles.insert(article);
       // remove sample entries
       this.#articles.remove(1); // "Sample Entry #1"
       this.#articles.remove(2); // "Sample Entry #2"
@@ -471,8 +494,8 @@ export default class Blog {
 
           console.log("New Article Data:", articleData);
           // local
-          await this.#databaseModel.save(articleData); // --> to api server
-          this.postArticle(articleData);
+          const savedArticle = await this.#databaseModel.save(articleData);
+          this.postArticle(savedArticle);
           // external
 
           // Success response
@@ -696,7 +719,10 @@ export default class Blog {
         //console.log(this.#articles.getAllArticles());
         const article = this.#articles.get(id);
         if (article) {
-          res.writeHead(200, { "Content-Type": "application/json" });
+          res.writeHead(200, {
+            "Content-Type": "application/json",
+            "Cache-Control": "public, max-age=60", // Cache for 60 seconds
+          });
           res.end(JSON.stringify(article));
         } else {
           res.writeHead(404, { "Content-Type": "application/json" });
@@ -742,19 +768,27 @@ export default class Blog {
         return;
       }
       const body = await new Promise((resolve, reject) => {
-        let data = "";
-        req.on("data", (chunk) => (data += chunk.toString()));
-        req.on("end", () => resolve(data));
+        const chunks = [];
+
+        req.on("data", (chunk) => {
+          chunks.push(chunk);
+        });
+
+        req.on("end", () => {
+          const result = Buffer.concat(chunks).toString();
+          resolve(result);
+        });
+
         req.on("error", reject);
       });
       const newArticle = JSON.parse(body);
       debug("new article: %s", newArticle.title);
       // local
-      await this.#databaseModel.save(newArticle); // --> to api server
-      this.postArticle(newArticle);
+      const savedArticle = await this.#databaseModel.save(newArticle);
+      this.postArticle(savedArticle);
       // external
       res.writeHead(201, { "Content-Type": "application/json" });
-      res.end(JSON.stringify(newArticle));
+      res.end(JSON.stringify(savedArticle));
     } else if (req.method === "DELETE") {
       debug("DELETE an article");
       const match = pathname.match(/^\/api\/articles\/(\d+)$/);
@@ -786,10 +820,20 @@ export default class Blog {
       if (pathname === "/api/articles" || match) {
         const id = match ? match[1] : url.searchParams.get("id");
         debug("PUT article id: %d", id);
-        const body = await new Promise((resolve) => {
-          let data = "";
-          req.on("data", (chunk) => (data += chunk));
-          req.on("end", () => resolve(data));
+        const body = await new Promise((resolve, reject) => {
+          const chunks = [];
+
+          req.on("data", (chunk) => {
+            // Speichert die Buffer-Referenzen direkt, ohne String-Konvertierung
+            chunks.push(chunk);
+          });
+
+          req.on("end", () => {
+            const data = Buffer.concat(chunks).toString();
+            resolve(data);
+          });
+
+          req.on("error", reject);
         });
         const { title, content } = JSON.parse(body);
         this.#articles.update(parseInt(id), title, content);
@@ -820,10 +864,9 @@ export default class Blog {
 
   /** render this blog content to valid html */
   async toHTML(loggedin) {
-    const articles = this.#articles.getAllArticles();
-    const articles_after = articles.slice(0, 50);
+    const articles_after = await this.#articles.findAll(null, null, 50);
     // prettier-ignore
-    debug("slice articles from %d to %d", articles.length, articles_after.length);
+    debug("fetched %d articles", articles_after.length);
     const data = {
       title: this.title,
       articles: articles_after,
@@ -843,13 +886,15 @@ export default class Blog {
     //debug("typeof data.articles: %o", typeof data.articles);
     //debug("typeof data.articles: %O", data.articles);
     const article = data.articles[0];
-    debug("first article: ");
-    debug(
-      "%d %s %s...",
-      article.id,
-      article.title,
-      article.getContentVeryShort(),
-    );
+    if (article) {
+      debug("first article: ");
+      debug(
+        "%d %s %s...",
+        article.id,
+        article.title,
+        article.getContentVeryShort(),
+      );
+    }
     const html = formatHTML(data);
     if (validate(html)) return html;
     throw new Error("Error. Invalid HTML!");
@@ -860,7 +905,7 @@ export default class Blog {
    * @param {string[]} files - Array of css/scss file paths to process.
    */
   async #processStylesheets(files) {
-    console.log("process stylesheets");
+    debug("process stylesheets");
 
     // Normalize input to array (handles string or array)
     // "file1.css" --> ["file1.css"]
@@ -886,16 +931,11 @@ export default class Blog {
       );
 
       // compute hash
-      const currentHash = crypto
-        .createHash("sha256")
-        .update(
-          fileData
-            .map((f) =>
-              crypto.createHash("sha256").update(f.content).digest("hex"),
-            )
-            .join(""),
-        )
-        .digest("hex");
+      const hash = crypto.createHash("sha256");
+      for (const file of fileData) {
+        hash.update(file.content);
+      }
+      const currentHash = hash.digest("hex");
 
       // check if hash matches
       if (currentHash !== this.#stylesHash && this.compilestyle) {
@@ -938,16 +978,11 @@ export default class Blog {
         }),
       );
 
-      const currentHash = crypto
-        .createHash("sha256")
-        .update(
-          fileData
-            .map((f) =>
-              crypto.createHash("sha256").update(f.content).digest("hex"),
-            )
-            .join(""),
-        )
-        .digest("hex");
+      const hash = crypto.createHash("sha256");
+      for (const file of fileData) {
+        hash.update(file.content);
+      }
+      const currentHash = hash.digest("hex");
 
       if (!this.#scriptsHash) {
         try {