@herdwatch/lokijs 1.5.8-dev.6 → 1.5.8-dev.8

package/index.d.ts

@@ -203,6 +203,17 @@ declare class Loki extends LokiEventEmitter {
   databaseVersion: number;
   engineVersion: number;
   autosave: boolean;
+  /**
+   * A flag that determines whether the autosave functionality should be ignored.
+   * If set to true, the autosave operation will be bypassed.
+   */
+  ignoreAutosave: boolean;
+  /**
+   * A boolean flag indicating whether the database should be serialized
+   * before saving. When set to true, the database content is converted
+   * to a serialized format to ensure data integrity during storage.
+   */
+  serializeDatabaseBeforeSave: boolean;
   autosaveInterval: number;
   autosaveHandle: number | null;
   persistenceAdapter: LokiPersistenceAdapter | null | undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@herdwatch/lokijs",
-  "version": "1.5.8-dev.6",
+  "version": "1.5.8-dev.8",
   "description": "Fast document oriented javascript in-memory database",
   "homepage": "http://lokijs.org",
   "types": "index.d.ts",
@@ -27,6 +27,7 @@
   ],
   "scripts": {
     "lint": "jshint src",
+    "test:browser:dev": "karma start karma.conf.js",
     "test:browser": "karma start karma.conf.js --single-run",
     "test:node": "istanbul cover --dir coverage/nodejs node_modules/jasmine/bin/jasmine.js",
     "pretest": "npm run lint",

package/src/loki-indexed-adapter.js

@@ -43,6 +43,11 @@
       this.app = 'loki';
       this.options = options || {};
 
+      // Helper for reproduce WebKit bug
+      // https://github.com/ionic-team/cordova-plugin-ionic-webview/issues/354
+      // https://github.com/ionic-team/capacitor/issues/7439
+      this.simulateErrorMessage = null;
+
       if (typeof appname !== 'undefined') {
         this.app = appname;
       }
@@ -142,17 +147,26 @@
      * @memberof LokiIndexedAdapter
      */
     LokiIndexedAdapter.prototype.saveDatabase = function (dbname, dbstring, callback) {
+      if(localStorage.getItem('debug-lokijs')){
+        console.time(`saveDatabase_${dbname}`);
+      }
       var appName = this.app;
       var adapter = this;
 
       /**
-       * @param { success: boolean, error: Error } result
+       * @param { {success: boolean, error: Error} } result
        */
       function saveCallback(result) {
         if (result && result.success === true) {
           callback(null);
+          if (localStorage.getItem('debug-lokijs')) {
+            console.timeEnd(`saveDatabase_${dbname}`);
+            const bytes = dbstring.length * 2;
+            const kb = bytes / 1024;
+            console.log(kb.toFixed(2) + ' KB');
+          }
         } else {
-          console.error('Error saving database', result);
+          console.error('saveDatabase->saveCallback, Error saving database', result);
           callback(result);
         }
 
@@ -171,7 +185,15 @@
       }
 
       // set (add/update) entry to AKV database
-      this.catalog.setAppKey(appName, dbname, dbstring, saveCallback);
+      try {
+        if (this.simulateErrorMessage) {
+          throw new Error(this.simulateErrorMessage);
+        }
+        this.catalog.setAppKey(appName, dbname, dbstring, saveCallback);
+      } catch (error) {
+        saveCallback({success: false, error});
+      }
+
     };
 
     // alias
@@ -451,7 +473,7 @@
           res = {
             app: app,
             key: key,
-            appkey: app + ',' + key,
+            appkey: appkey,
             val: val,
           };
         } else {
@@ -463,7 +485,7 @@
         requestPut.onerror = (function (usercallback) {
           return function (e) {
             if (typeof usercallback === 'function') {
-              usercallback({ success: false, error: request.error });
+              usercallback({ success: false, error: requestPut.error });
             } else {
               console.error('LokiCatalog.setAppKey (set) onerror');
               console.error(request.error);

package/src/lokijs.js

@@ -868,8 +868,10 @@
       // pass autosave: true, autosaveInterval: 6000 in options to set 6 second autosave
       this.autosave = false;
       this.autosaveInterval = 5000;
+      this.ignoreAutosave = false;
       this.autosaveHandle = null;
       this.throttledSaves = true;
+      this.serializeDatabaseBeforeSave = true;
 
       this.options = {};
 
@@ -2674,7 +2676,7 @@
       // or autosave won't work if an update occurs between here and the callback
       // TODO: This should be stored and rolled back in case of DB save failure
       // TODO: Reference mode adapter should have the same behavior
-      if (this.persistenceAdapter.mode !== "reference") {
+      if (this.serializeDatabaseBeforeSave && this.persistenceAdapter.mode !== "reference") {
         this.autosaveClearFlags();
       }
 
@@ -2707,6 +2709,14 @@
           self.autosaveClearFlags();
           cFun(err);
         });
+      } else if (this.serializeDatabaseBeforeSave === false){
+        if(localStorage.getItem('debug-lokijs')){
+          console.log("Performing full database save...");
+        }
+        this.persistenceAdapter.saveDatabase(this.filename, this, function saveDatabasecallback(err) {
+          self.autosaveClearFlags();
+          cFun(err);
+        });
       }
       // otherwise just pass the serialized database to adapter
       else {
@@ -2852,7 +2862,7 @@
         // so next step will be to implement collection level dirty flags set on insert/update/remove
         // along with loki level isdirty() function which iterates all collections to see if any are dirty
 
-        if (self.autosaveDirty()) {
+        if (self.autosaveDirty() && !self.ignoreAutosave) {
           self.saveDatabase(callback);
         }
       }, delay);