From f43e26b1b9a324d7c2aa4f6c952906c43379c2d6 Mon Sep 17 00:00:00 2001
From: Damjan Bursac <damjan.bursac@united.cloud>
Date: Thu, 16 May 2019 08:51:57 +0200
Subject: [PATCH] Database name and object store name creation

---
 src/Store.ts | 24 ++++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/src/Store.ts b/src/Store.ts
index 2a1207d..c38c5dc 100644
--- a/src/Store.ts
+++ b/src/Store.ts
@@ -11,10 +11,13 @@ export default class Store {
 
   private eventEmitter: EventEmitter;
 
-  // Use to count number of store objects created. Determine database nome
+  // Use to count number of store objects created. Determine database name
   private static storeCount: number = 0
   private readonly currentStoreCount: number = 0
 
+  /** @var {string} osName - Object store name */
+  private readonly osName: string = 'chunks'
+
   constructor (chunkLength: number) {
     this.currentStoreCount = Store.storeCount
     this.chunkLength = chunkLength;
@@ -45,7 +48,7 @@ export default class Store {
       this.db = ev.target.result;
 
       // Create an objectStore for this database
-      this.db.createObjectStore('torrent_chunk_store');
+      this.db.createObjectStore(this.osName);
     };
   }
 
@@ -61,8 +64,8 @@ export default class Store {
     }
 
     this.executeFn(() => {
-      let transaction = self.db.transaction('torrent_chunk_store', 'readonly');
-      let request = transaction.objectStore('torrent_chunk_store').get(index);
+      let transaction = this.db.transaction(this.osName, 'readonly');
+      let request = transaction.objectStore(this.osName).get(index);
 
       transaction.onerror = (ev) => {
         // Don't forget to handle errors!
@@ -105,7 +108,7 @@ export default class Store {
         // Don't forget to handle errors!
       }
 
-      let request = transaction.objectStore('torrent_chunk_store').put(chunkBuffer, index)
+      let request = transaction.objectStore(this.osName).put(chunkBuffer, index)
 
       this.resolveRequest(request, (err, ev) => {
         cb(err, ev)
@@ -139,7 +142,7 @@ export default class Store {
    * Get database name based on storeCount
    */
   private getDatabaseName () {
-    const databaseName = 'torrent_chunks'
+    const databaseName = 'torrent_chunk_store'
 
     if (this.currentStoreCount === 0) {
       return databaseName
@@ -148,6 +151,11 @@ export default class Store {
     return databaseName + '_' + this.currentStoreCount
   }
 
+  /**
+   * Resolve IDBRequest.
+   * @param {IDBRequest} request
+   * @param {Function} cb
+   */
   private resolveRequest (request: IDBRequest, cb?: (err: Error, ev?: Event) => void) {
     request.onsuccess = (ev) => {
       cb(null, ev)
@@ -158,6 +166,10 @@ export default class Store {
     }
   }
 
+  /**
+   * Execute IDBRequest depending whether database is opened or not
+   * @param cb
+   */
   private executeFn (cb) {
     if (!this.db) {
       this.eventEmitter.subscribe(cb)