@iobroker/db-base 1.2.2 → 4.0.0-alpha.10-20211116-cb8ad50a

package/lib/inMemFileDB.js

@@ -286,15 +286,17 @@ class InMemoryFileDB {
      * Handle saving the dataset incl. backups
      */
     async saveState() {
-        if (this.stateTimer) {
-            clearTimeout(this.stateTimer);
-            this.stateTimer = null;
-        }
-
-        const jsonString = await this.saveDataset();
+        try {
+            const jsonString = await this.saveDataset();
 
-        if (!this.settings.backup.disabled && jsonString) {
-            this.saveBackup(jsonString);
+            if (!this.settings.backup.disabled && jsonString) {
+                this.saveBackup(jsonString);
+            }
+        } finally {
+            if (this.stateTimer) {
+                clearTimeout(this.stateTimer);
+                this.stateTimer = null;
+            }
         }
     }
 
@@ -432,6 +434,7 @@ class InMemoryFileDB {
     // Destructor of the class. Called by shutting down.
     async destroy() {
         if (this.stateTimer) {
+            clearTimeout(this.stateTimer);
             await this.saveState();
         }
     }

package/lib/tools.js

@@ -1,51 +1,7 @@
-const path = require('path');
-const fs = require('fs');
+const { tools } = require('@iobroker/js-controller-common');
 
-function getControllerDir() {
-    const possibilities = ['iobroker.js-controller', 'ioBroker.js-controller'];
-    for (const pkg of possibilities) {
-        try {
-            // package.json is guaranteed to be in the module root folder
-            // so once that is resolved, take the dirname and we're done
-            const possiblePath = require.resolve(`${pkg}/package.json`);
-            if (fs.existsSync(possiblePath)) {
-                return path.dirname(possiblePath);
-            }
-        } catch {
-            /* not found */
-        }
-    }
-
-    // Apparently, checking vs null/undefined may miss the odd case of controllerPath being ""
-    // Thus we check for falsyness, which includes failing on an empty path
-    let checkPath = path.join(__dirname, '../..');
-    // Also check in the current check dir (along with iobroker.js-controller subdirs)
-    possibilities.unshift('');
-    while (true) {
-        for (const pkg of possibilities) {
-            try {
-                const possiblePath = path.join(checkPath, pkg);
-                if (fs.existsSync(path.join(possiblePath, 'lib/tools.js'))) {
-                    return possiblePath;
-                }
-            } catch {
-                // not found, continue with next possiblity
-            }
-        }
-
-        // Controller not found here - go to the parent dir
-        const newPath = path.dirname(checkPath);
-        if (newPath === checkPath) {
-            // We already reached the root dir, abort
-            break;
-        }
-        checkPath = newPath;
-    }
-}
-
-const controllerDir = getControllerDir() || __dirname;
-
-module.exports = require(path.join(controllerDir , 'lib/tools.js'));
+module.exports = tools;
+const controllerDir = tools.getControllerDir() || __dirname;
 module.exports.getControllerDir = () => controllerDir;
 
 /**

package/package.json

@@ -1,12 +1,13 @@
 {
   "name": "@iobroker/db-base",
-  "version": "1.2.2",
+  "version": "4.0.0-alpha.10-20211116-cb8ad50a",
   "engines": {
-    "node": ">=10.0.0"
+    "node": ">=12.0.0"
   },
   "dependencies": {
+    "@iobroker/js-controller-common": "4.0.0-alpha.10-20211116-cb8ad50a",
     "deep-clone": "^3.0.3",
-    "fs-extra": "^9.1.0",
+    "fs-extra": "^10.0.0",
     "node.extend": "^2.0.2",
     "respjs": "^4.2.0"
   },
@@ -19,11 +20,11 @@
   "contributors": [
     "bluefox <dogafox@gmail.com>",
     "Apollon77 <iobroker@fischer-ka.de>",
-    "foxriver76"
+    "foxriver76 <moritz.heusinger@gmail.com>"
   ],
   "repository": {
     "type": "git",
-    "url": "https://github.com/ioBroker/ioBroker.objects-redis"
+    "url": "https://github.com/ioBroker/ioBroker.js-controller/packages/db-base"
   },
   "scripts": {},
   "main": "index.js",
@@ -31,5 +32,9 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "4c8d634f852df47355b22af22537cff5f2d7ad7c"
+  "files": [
+    "lib/",
+    "index.js"
+  ],
+  "gitHead": "7e4b1475d5d59e3540a6111f69f8a3bc9536f751"
 }