From a349d8af68dc8d531aa30ae9721c4317e00bbc3d Mon Sep 17 00:00:00 2001
From: Book Pauk <bookpauk@gmail.com>
Date: Tue, 8 Feb 2022 20:55:31 +0700
Subject: [PATCH] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=B8=D0=BB=20?=
 =?UTF-8?q?=D0=BF=D0=B0=D0=BA=D0=B5=D1=82=20JembaDb?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package-lock.json             | 18 +++++++++---------
 package.json                  |  2 +-
 server/db/JembaConnManager.js | 14 +++++++++-----
 3 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 7865b34a..5ce0d2b1 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "Liberama",
-  "version": "0.11.1",
+  "version": "0.11.2",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "Liberama",
-      "version": "0.11.1",
+      "version": "0.11.2",
       "hasInstallScript": true,
       "license": "CC0-1.0",
       "dependencies": {
@@ -22,7 +22,7 @@
         "got": "^11.8.2",
         "he": "^1.2.0",
         "iconv-lite": "^0.6.3",
-        "jembadb": "^1.3.0",
+        "jembadb": "^2.2.0",
         "localforage": "^1.10.0",
         "lodash": "^4.17.21",
         "minimist": "^1.2.5",
@@ -6379,9 +6379,9 @@
       }
     },
     "node_modules/jembadb": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/jembadb/-/jembadb-1.3.0.tgz",
-      "integrity": "sha512-zMJ1GyXmqvniWToaZTzc3JPHK+SfvcynFHYsZAx8bJWlgVdQd6cqYpIEXJFP+3OZqxPTzMYG5OBGclxTsoOqtg==",
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/jembadb/-/jembadb-2.2.0.tgz",
+      "integrity": "sha512-1ddK0F4hAvDPmiSqPkn8GMbG7O+mMTbEG8oSOM+XczW1gdpChKt699ewUdFlMmTAQsx4XC43WDfVZzulc4a+3w==",
       "engines": {
         "node": ">=14.4.0"
       }
@@ -16229,9 +16229,9 @@
       }
     },
     "jembadb": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/jembadb/-/jembadb-1.3.0.tgz",
-      "integrity": "sha512-zMJ1GyXmqvniWToaZTzc3JPHK+SfvcynFHYsZAx8bJWlgVdQd6cqYpIEXJFP+3OZqxPTzMYG5OBGclxTsoOqtg=="
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/jembadb/-/jembadb-2.2.0.tgz",
+      "integrity": "sha512-1ddK0F4hAvDPmiSqPkn8GMbG7O+mMTbEG8oSOM+XczW1gdpChKt699ewUdFlMmTAQsx4XC43WDfVZzulc4a+3w=="
     },
     "jest-worker": {
       "version": "27.3.1",
diff --git a/package.json b/package.json
index dd35260f..815dd62f 100644
--- a/package.json
+++ b/package.json
@@ -60,7 +60,7 @@
     "got": "^11.8.2",
     "he": "^1.2.0",
     "iconv-lite": "^0.6.3",
-    "jembadb": "^1.3.0",
+    "jembadb": "^2.2.0",
     "localforage": "^1.10.0",
     "lodash": "^4.17.21",
     "minimist": "^1.2.5",
diff --git a/server/db/JembaConnManager.js b/server/db/JembaConnManager.js
index d91e3d44..b989e00f 100644
--- a/server/db/JembaConnManager.js
+++ b/server/db/JembaConnManager.js
@@ -46,12 +46,16 @@ class JembaConnManager {
             }
 
             log(`Open "${dbConfig.dbName}" begin`);
-            await dbConn.openDb({
+            await dbConn.lock({
                 dbPath,
                 create: true,
-                cacheSize: dbConfig.cacheSize,
-                compressed: dbConfig.compressed,
-                forceFileClosing: dbConfig.forceFileClosing
+                softLock: true,
+                
+                tableDefaults: {
+                    cacheSize: dbConfig.cacheSize,
+                    compressed: dbConfig.compressed,
+                    forceFileClosing: dbConfig.forceFileClosing
+                },
             });
 
             if (dbConfig.openAll) {
@@ -97,7 +101,7 @@ class JembaConnManager {
             return;
 
         for (const dbConfig of this.config.jembaDb) {
-            await this._db[dbConfig.dbName].closeDb();
+            await this._db[dbConfig.dbName].unlock();
         }
 
         this._db = {};