@lexho111/plainblog 0.2.0 → 0.2.2

package/Blog.js

@@ -250,9 +250,14 @@ export default class Blog {
           loggedin = true;
         }
 
-        const html = await this.toHTML(loggedin); // render this blog to HTML
-        res.writeHead(200, { "Content-Type": "text/html; charset=UTF-8" });
-        res.end(html);
+        try {
+          const html = this.toHTML(loggedin); // render this blog to HTML
+          res.writeHead(200, { "Content-Type": "text/html; charset=UTF-8" });
+          res.end(html);
+        } catch (err) {
+          res.writeHead(500, { "Content-Type": "text/plain" });
+          res.end("Internal Server Error");
+        }
       } else {
         // Error 404
         res.writeHead(404, { "Content-Type": "application/json" });
@@ -373,37 +378,17 @@ export default class Blog {
   }
 
   /** print markdown to the console */
-  async print() {
+  print() {
     const data = {
       title: this.title,
       articles: this.articles,
     };
-    //const markdown = formatMarkdown(data);
-    
-    return new Promise((resolve, reject) => {
-    let markdownResult = "";
-      pipeline(
-        Readable.from([data]),
-        new MapTransform((chunk) => formatMarkdown(chunk, this.scripts, this.styles)),
-        new Writable({
-          write(chunk, encoding, callback) {
-            markdownResult += chunk.toString();
-            callback();
-          },
-        }),
-        (err) => {
-          if (err) reject(err);
-          else {
-            console.log(markdownResult)
-            resolve(markdownResult);
-          }
-        }
-      );
-    });
+    const markdown = formatMarkdown(data);
+    return markdown;
   }
 
   /** render this blog content to valid html */
-  async toHTML(loggedin) {
+  toHTML(loggedin) {
     const data = {
       title: this.title,
       articles: this.articles,
@@ -413,28 +398,8 @@ export default class Blog {
 
     if(loggedin) data.login = `<a href="/logout">logout</a>`;
     else data.login = `<a href="/login">login</a>`;
-
-    return new Promise((resolve, reject) => {
-      let htmlResult = "";
-      pipeline(
-        Readable.from([data]),
-        new MapTransform((chunk) => formatHTML(chunk, this.scripts, this.styles)),
-        new MapTransform((chunk) => {
-              const html = chunk.toString();
-              if (validate(html)) return html;
-              throw new Error("Error. Invalid HTML!");
-            }),
-        new Writable({
-          write(chunk, encoding, callback) {
-            htmlResult += chunk.toString();
-            callback();
-          },
-        }),
-        (err) => {
-          if (err) reject(err);
-          else resolve(htmlResult);
-        }
-      );
-    });
+    const html = formatHTML(data, this.scripts, this.styles);
+    if (validate(html)) return html;
+    throw new Error("Error. Invalid HTML!");
   }
 }

package/README.md

@@ -1,6 +1,6 @@
 # Plainblog
 
-Plainblog is a simple blog generator to help you to set up and to maintain a minimalistic **single-page blog**. You can add new articles directly in the browser. Articles are stored in a file or a database specified via an API.
+Plainblog is a simple blog generator to help you to set up and to maintain a minimalistic **single-page blog**. You can add new articles directly in the browser.
 
 ## Installation
 
@@ -20,7 +20,7 @@ blog.setStyle("body { font-family: Arial, sans-serif; } h1 { color: #333; }");
 blog.startServer(8080);
 ```
 
-Now you can start to add articles to your blog via your webbrowser on `http://localhost:8080`.
+Now you can open your blog in your webbrowser on `http://localhost:8080`. Login via the login link in the navbar to begin with adding new articles, the password is '**_admin_**'.
 
 ## More Features
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lexho111/plainblog",
-  "version": "0.2.0",
+  "version": "0.2.2",
   "description": "A tool for creating and serving a minimalist, single-page blog.",
   "main": "index.js",
   "type": "module",

package/test/server.test.js

@@ -105,6 +105,6 @@ describe("server test", () => {
     const responseData = await response.json();
     expect(responseData).toEqual(newArticle);
 
-    expect(await blog.toHTML()).toContain(newArticle.content); // does blog contain my new article?
+    expect(blog.toHTML()).toContain(newArticle.content); // does blog contain my new article?
   });
 });