@lexho111/plainblog 0.0.6 → 0.0.8

package/README.md

@@ -50,7 +50,11 @@ docker run -p 5432:5432 --name postgresdb --restart always -e POSTGRES_USER=user
 
 ```
 import { Blog, storageserver} from "@lexho111/plainblog";
-await storageserver("postgres", 8081); // you can use a postgres db too
+
+storageserver.setUsername("username");
+storageserver.setPassword("password");
+storageserver.setHost("localhost");
+await storageserver.start("postgres", 8081);
 const blog = new Blog();
 blog.setAPI(storageserver.getAPIURL());
 blog.setStyle("body { font-family: Arial, sans-serif; } h1 { color: #333; }");

package/api-server.js

@@ -21,7 +21,8 @@ const blogData = {
 let username;
 let password;
 let host;
-let dbport = 5432;
+const dbport = 5432;
+const dbname = process.env.POSTGRES_DB || "blog";
 
 export function setUsername(username1) {
   username = username1;
@@ -51,20 +52,13 @@ export async function start(databasetype, port = 8081) {
         "PostgreSQL credentials not set. Please use setUsername(), setPassword(), and setHost() before starting the server."
       );
     }
+
     sequelize = new Sequelize(
-      `postgres://${username}:${password}@${host}:${dbport}/blog`,
-      {
-        logging: false,
-      }
-    ); // Connect to local Docker container
-  } else {
-    console.error(
-      `Invalid or no database type specified. Received: "${databasetype}". Exiting.`
+      `postgres://${username}:${password}@${host}:${dbport}/${dbname}`,
+      { logging: false }
     );
-    process.exit(1);
   }
 
-  // Define the Article model using the single sequelize instance
   const Article = sequelize.define(
     "Article",
     {
@@ -77,15 +71,34 @@ export async function start(databasetype, port = 8081) {
   );
 
   try {
-    // Sync all models with the database (creates tables if they don't exist)
-    await sequelize.sync();
-    console.log("Database synchronized.");
-    // Optionally, populate initial data if the database is empty
-    if ((await Article.count()) === 0) {
-      for (const articleData of blogData.articles) {
-        await Article.create(articleData);
+    // The connectWithRetry logic is now integrated here and properly awaited.
+    let retries = 5;
+    while (retries) {
+      try {
+        await sequelize.authenticate();
+        console.log("Connection has been established successfully.");
+
+        // Sync all models and populate data
+        await sequelize.sync({ alter: true });
+        console.log("All models were synchronized successfully.");
+
+        if ((await Article.count()) === 0) {
+          for (const articleData of blogData.articles) {
+            await Article.create(articleData);
+          }
+          console.log("Initial blog data populated.");
+        }
+        break; // Success, exit retry loop
+      } catch (err) {
+        // For sqlite, we don't need to retry, just throw the error.
+        if (databasetype === "sqlite") throw err;
+
+        console.error("Unable to connect to the database:", err.name);
+        retries -= 1;
+        console.log(`Retries left: ${retries}`);
+        if (retries === 0) throw err; // Throw error if max retries reached
+        await new Promise((res) => setTimeout(res, 5000));
       }
-      console.log("Initial blog data populated.");
     }
 
     const server = http.createServer(async (req, res) => {

package/eslint.config.js

@@ -0,0 +1,45 @@
+import globals from "globals";
+import pluginJs from "@eslint/js";
+import pluginJest from "eslint-plugin-jest";
+
+export default [
+  {
+    // Configuration for all JavaScript files
+    files: ["**/*.js"],
+    languageOptions: {
+      ecmaVersion: 2022, // Supports modern JavaScript features
+      sourceType: "module",
+      globals: {
+        ...globals.node, // Defines Node.js global variables (e.g., `process`, `require`)
+      },
+    },
+    // ESLint's recommended rules for general JavaScript
+    rules: {
+      ...pluginJs.configs.recommended.rules,
+      // Add or override general JavaScript rules here.
+      // Example: Enforce semicolons at the end of statements
+      semi: ["error", "always"],
+      // Example: Prefer `const` over `let` where variables are not reassigned
+      "prefer-const": "error",
+      // Example: Prevent unused variables (can be configured further)
+      "no-unused-vars": ["warn", { args: "none" }],
+    },
+  },
+  {
+    // Configuration specifically for Jest test files
+    files: ["**/*.test.js", "**/*.spec.js"],
+    languageOptions: {
+      globals: {
+        ...globals.jest, // Defines Jest global variables (e.g., `describe`, `it`, `expect`)
+      },
+    },
+    plugins: {
+      jest: pluginJest,
+    },
+    // Recommended Jest rules from `eslint-plugin-jest`
+    rules: {
+      ...pluginJest.configs.recommended.rules,
+      // Add or override Jest-specific rules here.
+    },
+  },
+];

package/package.json

@@ -1,11 +1,12 @@
 {
   "name": "@lexho111/plainblog",
-  "version": "0.0.6",
+  "version": "0.0.8",
   "description": "A tool for creating and serving a minimalist, single-page blog.",
   "main": "index.js",
   "type": "module",
   "scripts": {
-    "test": "node --experimental-vm-modules node_modules/jest/bin/jest.js"
+    "test": "node --experimental-vm-modules node_modules/jest/bin/jest.js",
+    "lint": "eslint ."
   },
   "keywords": [
     "blog",
@@ -22,6 +23,8 @@
     "sqlite3": "^5.1.7"
   },
   "devDependencies": {
-    "jest": "^30.2.0"
+    "eslint": "^9.8.0",
+    "eslint-plugin-jest": "^28.6.0",
+    "jest": "^29.7.0"
   }
 }

package/test/server.test.js

@@ -12,7 +12,9 @@ describe("API Server Health Check", () => {
   });
 
   afterAll((done) => {
-    server.close(done);
+    server.close(() => {
+      done();
+    });
   });
 
   test("should respond with 200 OK on the /health endpoint", async () => {