@onurege3467/zerohelper 2.0.2 → 2.1.0

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

@@ -1,58 +1,135 @@
 const fs = require("fs");
 const path = require("path");
 const sqlite3 = require("sqlite3").verbose();
+
 class Database {
   constructor(dbFilePath) {
     this.dbFilePath = dbFilePath || path.join(__dirname, "database.sqlite");
     this.db = null;
+
+    // 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);
+            });
+        }
+      });
+    });
   }
 
-  initialize() {
-    if (!fs.existsSync(this.dbFilePath)) {
-      console.log("Creating database file...");
-      fs.writeFileSync(this.dbFilePath, "");
+  _ensureDatabaseInitialized() {
+    if (!this.db) {
+      throw new Error(
+        "Database is not initialized. Ensure the database file exists."
+      );
     }
+  }
+
+  _parseNestedKey(key) {
+    return key.includes(".") ? key.split(".") : [key];
+  }
+
+  _buildNestedObject(keys, value) {
+    return keys.reverse().reduce((acc, curr) => ({ [curr]: acc }), value);
+  }
 
-    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));
+  _mergeObjects(target, source) {
+    for (const key in source) {
+      if (source[key] instanceof Object && key in target) {
+        Object.assign(
+          source[key],
+          this._mergeObjects(target[key], source[key])
+        );
       }
-    });
+    }
+    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) => {
+        const nestedObject = this._buildNestedObject(keys.slice(1), value);
+        const mergedValue = this._mergeObjects(
+          currentValue || {},
+          nestedObject
+        );
+        return this.set(keys[0], mergedValue);
+      });
+    }
+
     return this.runQuery(
       `INSERT INTO key_value_store (key, value) VALUES (?, ?) ON CONFLICT(key) DO UPDATE SET value = excluded.value`,
       [key, JSON.stringify(value)]
     );
   }
 
-  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 = ?`, [
-      key,
-    ]).then((row) => (row ? JSON.parse(row.value) : null));
+      keys[0],
+    ]).then((row) => {
+      if (!row) return null;
+      const value = JSON.parse(row.value);
+      return keys.length > 1
+        ? keys.slice(1).reduce((acc, curr) => (acc ? acc[curr] : null), value)
+        : value;
+    });
   }
 
-  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) => {
+        if (!currentValue) return null;
+        let ref = currentValue;
+        for (let i = 0; i < keys.length - 1; i++) {
+          if (!ref[keys[i]]) return null;
+          if (i === keys.length - 2) {
+            delete ref[keys[i + 1]];
+          } else {
+            ref = ref[keys[i]];
+          }
+        }
+        return this.set(keys[0], currentValue);
+      });
+    }
     return this.runQuery(`DELETE FROM key_value_store WHERE key = ?`, [key]);
   }
 
-  has(key) {
-    return this.getQuery(`SELECT 1 FROM key_value_store WHERE key = ?`, [
-      key,
-    ]).then((row) => !!row);
+  async has(key) {
+    await this.ready; // Veritabanı hazır olana kadar bekle
+    return this.get(key).then((value) => value !== null);
   }
 
-  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 = [];
@@ -62,7 +139,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;
@@ -71,7 +149,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;
@@ -105,13 +184,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.");
+        }
+      });
+    }
   }
 }
 
@@ -119,23 +200,11 @@ module.exports = Database;
 
 // Example usage:
 // const db = new Database();
-// db.initialize();
-// db.set('foo', 'bar')
+// db.set('foo.bar.baz', 'value')
+//   .then(() => db.get('foo.bar'))
+//   .then((value) => console.log('Value:', value)) // Output: { baz: 'value' }
+//   .then(() => db.delete('foo.bar.baz'))
 //   .then(() => db.get('foo'))
-//   .then((value) => console.log('Value:', value)) // Output: bar
-//   .then(() => db.push('array', 'x'))
-//   .then(() => db.get('array'))
-//   .then((value) => console.log('Array:', value)) // Output: ['x']
-//   .then(() => db.add('number', 1))
-//   .then(() => db.get('number'))
-//   .then((value) => console.log('Number:', value)) // Output: 1
-//   .then(() => db.sub('number', 1))
-//   .then(() => db.get('number'))
-//   .then((value) => console.log('Number after sub:', value)) // Output: 0
-//   .then(() => db.has('foo'))
-//   .then((exists) => console.log('Exists:', exists)) // Output: true
-//   .then(() => db.delete('foo'))
-//   .then(() => db.has('foo'))
-//   .then((exists) => console.log('Exists after delete:', exists)) // Output: false
+//   .then((value) => console.log('After delete:', value)) // Output: {}
 //   .catch((err) => console.error(err))
 //   .finally(() => db.close());

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", "bar");
-  console.log(await db.get("foo"));
+  await db.set("foo.test", "bar");
+  console.log(await db.get("foo.test"));
 };
 
 runSQLite();

package/package.json

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