@onurege3467/zerohelper 2.0.3 → 2.1.1

package/database/index.js

@@ -1,11 +1,34 @@
+/**
+ * @module Database
+ */
+
 var JsonDatabase = require("./jsondatabase/index");
 var MongoDB = require("./mongodb/index");
 var MySQLDatabase = require("./mysql/index");
 var SQLiteDatabase = require("./sqldb/index");
 
 module.exports = {
+  /**
+   * JSON-based database.
+   * @type {JsonDatabase}
+   */
   JsonDatabase,
+
+  /**
+   * MongoDB-based database.
+   * @type {MongoDB}
+   */
   MongoDB,
+
+  /**
+   * MySQL-based database.
+   * @type {MySQLDatabase}
+   */
   MySQLDatabase,
+
+  /**
+   * SQLite-based database.
+   * @type {SQLiteDatabase}
+   */
   SQLiteDatabase,
 };

package/database/sqldb/index.js

@@ -6,30 +6,45 @@ class Database {
   constructor(dbFilePath) {
     this.dbFilePath = dbFilePath || path.join(__dirname, "database.sqlite");
     this.db = null;
-  }
-
-  initialize() {
-    if (!fs.existsSync(this.dbFilePath)) {
-      console.log("Creating database file...");
-      fs.writeFileSync(this.dbFilePath, "");
-    }
 
-    this.db = new sqlite3.Database(this.dbFilePath, (err) => {
-      if (err) {
-        console.error("Error opening database:", err.message);
-      } else {
-        console.log("Connected to the SQLite database.");
-        this.runQuery(
-          `CREATE TABLE IF NOT EXISTS key_value_store (key TEXT PRIMARY KEY, value TEXT)`
-        )
-          .then(() => {
-            console.log("Table initialized");
-          })
-          .catch((err) => console.error(err));
+    // Veritabanı hazır olana kadar işlemleri bekletmek için bir Promise
+    this.ready = new Promise((resolve, reject) => {
+      if (!fs.existsSync(this.dbFilePath)) {
+        console.log("Database file does not exist. Creating the file...");
+        fs.writeFileSync(this.dbFilePath, ""); // Boş bir dosya oluştur
       }
+
+      // Veritabanını başlat
+      this.db = new sqlite3.Database(this.dbFilePath, (err) => {
+        if (err) {
+          console.error("Error opening database:", err.message);
+          reject(err);
+        } else {
+          console.log("Connected to the SQLite database.");
+          this.runQuery(
+            `CREATE TABLE IF NOT EXISTS key_value_store (key TEXT PRIMARY KEY, value TEXT)`
+          )
+            .then(() => {
+              console.log("Table initialized");
+              resolve(); // Veritabanı hazır
+            })
+            .catch((err) => {
+              console.error(err);
+              reject(err);
+            });
+        }
+      });
     });
   }
 
+  _ensureDatabaseInitialized() {
+    if (!this.db) {
+      throw new Error(
+        "Database is not initialized. Ensure the database file exists."
+      );
+    }
+  }
+
   _parseNestedKey(key) {
     return key.includes(".") ? key.split(".") : [key];
   }
@@ -50,7 +65,9 @@ class Database {
     return { ...target, ...source };
   }
 
-  set(key, value) {
+  async set(key, value) {
+    await this.ready; // Veritabanı hazır olana kadar bekle
+    this._ensureDatabaseInitialized();
     const keys = this._parseNestedKey(key);
     if (keys.length > 1) {
       return this.get(keys[0]).then((currentValue) => {
@@ -69,7 +86,9 @@ class Database {
     );
   }
 
-  get(key) {
+  async get(key) {
+    await this.ready; // Veritabanı hazır olana kadar bekle
+    this._ensureDatabaseInitialized();
     const keys = this._parseNestedKey(key);
     return this.getQuery(`SELECT value FROM key_value_store WHERE key = ?`, [
       keys[0],
@@ -82,7 +101,9 @@ class Database {
     });
   }
 
-  delete(key) {
+  async delete(key) {
+    await this.ready; // Veritabanı hazır olana kadar bekle
+    this._ensureDatabaseInitialized();
     const keys = this._parseNestedKey(key);
     if (keys.length > 1) {
       return this.get(keys[0]).then((currentValue) => {
@@ -102,11 +123,18 @@ class Database {
     return this.runQuery(`DELETE FROM key_value_store WHERE key = ?`, [key]);
   }
 
-  has(key) {
-    return this.get(key).then((value) => value !== null);
+  async has(key) {
+    await this.ready;
+    let result = undefined; // Veritabanı hazır olana kadar bekle
+    await this.get(key).then((value) => (result = value));
+    if (!result) return false;
+    else {
+      return true;
+    }
   }
 
-  push(key, value) {
+  async push(key, value) {
+    await this.ready; // Veritabanı hazır olana kadar bekle
     return this.get(key).then((currentValue) => {
       if (!Array.isArray(currentValue)) {
         currentValue = [];
@@ -116,7 +144,8 @@ class Database {
     });
   }
 
-  add(key, value) {
+  async add(key, value) {
+    await this.ready; // Veritabanı hazır olana kadar bekle
     return this.get(key).then((currentValue) => {
       if (typeof currentValue !== "number") {
         currentValue = 0;
@@ -125,7 +154,8 @@ class Database {
     });
   }
 
-  sub(key, value) {
+  async sub(key, value) {
+    await this.ready; // Veritabanı hazır olana kadar bekle
     return this.get(key).then((currentValue) => {
       if (typeof currentValue !== "number") {
         currentValue = 0;
@@ -159,13 +189,15 @@ class Database {
   }
 
   close() {
-    this.db.close((err) => {
-      if (err) {
-        console.error("Error closing database:", err.message);
-      } else {
-        console.log("Database connection closed.");
-      }
-    });
+    if (this.db) {
+      this.db.close((err) => {
+        if (err) {
+          console.error("Error closing database:", err.message);
+        } else {
+          console.log("Database connection closed.");
+        }
+      });
+    }
   }
 }
 
@@ -173,7 +205,6 @@ module.exports = Database;
 
 // Example usage:
 // const db = new Database();
-// db.initialize();
 // db.set('foo.bar.baz', 'value')
 //   .then(() => db.get('foo.bar'))
 //   .then((value) => console.log('Value:', value)) // Output: { baz: 'value' }

package/database/test.js

@@ -43,9 +43,8 @@ const runJsonDatabase = async () => {
 const runSQLite = async () => {
   const { database } = require("../index");
   var db = new database.SQLiteDatabase();
-  await db.initialize();
-  await db.set("foo.test", "bar");
-  console.log(await db.get("foo.test"));
+  await db.set("foo.test2", { Date: Date.now(), name: "Onur" });
+  console.log(await db.has("foo.test2.a"));
 };
 
 runSQLite();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onurege3467/zerohelper",
-  "version": "2.0.3",
+  "version": "2.1.1",
   "main": "index.js",
   "scripts": {
     "test": "node test.js"

package/database/mongodb/src/structers/Database.js

@@ -1,53 +0,0 @@
-const mongodb = require("mongodb");
-const { Collection } = require("./Collection.js");
-
-class Database {
-
-    /**
-     * It has Db feature in MongoDB. Most operations are done with this area.
-     * @type {mongodb.Db}
-     */
-    Db;
-
-    /**
-     * It carries the Client connected to MongoDB.
-     * @type {mongodb.MongoClient}
-     */
-    Client;
-
-    /**
-     * 
-     * @param {mongodb.MongoClient} client 
-     * @param {mongodb.Db} databaseName 
-     */
-    constructor(client, databaseName) {
-        this.Client = client;
-        this.Db = this.Client.db(databaseName);
-    }
-
-    /**
-     * If collection does not exists, creates collection then returns the collection. Otherwise just returns collection.
-     * @param {String} collectionName 
-     * @return {Collection}
-     */
-    collection(collectionName) {
-        const dbCollection = this.Db.collection(collectionName);
-        dbCollection.createIndex({ key: 1 });
-        const collection = new Collection(dbCollection);
-
-        return collection;
-    }
-
-    /**
-     * Drops the Database Collection.
-     * @param {String} collectionName 
-     * @return {Promise<void>} 
-     */
-    async dropCollection(collectionName) {
-        const flag = await this.Db.dropCollection(collectionName);
-
-        return flag;
-    }
-}
-
-module.exports = { Database };