@iobroker/db-base 1.2.4 → 4.0.0-alpha.12-20211121-4ca7ec41

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.4",
+  "version": "4.0.0-alpha.12-20211121-4ca7ec41",
   "engines": {
-    "node": ">=10.0.0"
+    "node": ">=12.0.0"
   },
   "dependencies": {
+    "@iobroker/js-controller-common": "4.0.0-alpha.12-20211121-4ca7ec41",
     "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": "43db6ddccf43383a6df968218ecc58e1d61a70e3"
+  "files": [
+    "lib/",
+    "index.js"
+  ],
+  "gitHead": "fc84c4a314fefc8bb65182eb18b9573f79599237"
 }