@iobroker/js-controller-common-db 7.0.2 → 7.0.3

package/build/cjs/lib/common/tools.js

@@ -19,6 +19,10 @@ var __copyProps = (to, from, except, desc) => {
 };
 var __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "default"), secondTarget && __copyProps(secondTarget, mod, "default"));
 var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
   isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
   mod
 ));
@@ -113,6 +117,7 @@ __export(tools_exports, {
   validateGeneralObjectProperties: () => validateGeneralObjectProperties
 });
 module.exports = __toCommonJS(tools_exports);
+var __import_meta_url = typeof document === "undefined" ? new (require("url".replace("", ""))).URL("file:" + __filename).href : document.currentScript && document.currentScript.src || new URL("main.js", document.baseURI).href;
 var import_fs_extra = __toESM(require("fs-extra"), 1);
 var import_node_path = __toESM(require("node:path"), 1);
 var import_semver = __toESM(require("semver"), 1);
@@ -139,9 +144,8 @@ var import_aliasProcessing = require("../../lib/common/aliasProcessing.js");
 var url = __toESM(require("node:url"), 1);
 var import_node_module = require("node:module");
 __reExport(tools_exports, require("../../lib/common/maybeCallback.js"), module.exports);
-const import_meta = {};
-const thisDir = url.fileURLToPath(new URL(".", import_meta.url || `file://${__filename}`));
-const require2 = (0, import_node_module.createRequire)(import_meta.url || `file://${__filename}`);
+const thisDir = url.fileURLToPath(new URL(".", __import_meta_url || `file://${__filename}`));
+const require2 = (0, import_node_module.createRequire)(__import_meta_url || `file://${__filename}`);
 var ERRORS;
 (function(ERRORS2) {
   ERRORS2["ERROR_NOT_FOUND"] = "Not exists";
@@ -457,7 +461,7 @@ async function updateUuid(newUuid, _objects) {
         name: "uuid",
         type: "uuid"
       },
-      ts: new Date().getTime(),
+      ts: (/* @__PURE__ */ new Date()).getTime(),
       from: `system.host.${getHostName()}.tools`,
       native: {
         uuid: _uuid
@@ -488,7 +492,7 @@ async function createUuid(objects) {
             dontDelete: true,
             enabled: true
           },
-          ts: new Date().getTime(),
+          ts: (/* @__PURE__ */ new Date()).getTime(),
           from: `system.host.${getHostName()}.tools`,
           native: {}
         });
@@ -726,6 +730,7 @@ function scanDirectory(dirName, list, regExp) {
             icon: ioPackage.common.extIcon || localIcon,
             localIcon,
             title: ioPackage.common.title,
+            // deprecated 2021.04.18 BF
             titleLang: ioPackage.common.titleLang,
             desc: ioPackage.common.desc,
             platform: ioPackage.common.platform,
@@ -764,6 +769,7 @@ function getInstalledInfo(hostRunningVersion) {
       version: ioPackage.common.version,
       icon: ioPackage.common.extIcon || ioPackage.common.icon,
       title: ioPackage.common.title,
+      // deprecated 2021.04.18 BF
       titleLang: ioPackage.common.titleLang,
       desc: ioPackage.common.desc,
       platform: ioPackage.common.platform,
@@ -1023,7 +1029,7 @@ function getRepositoryFile(urlOrPath, additionalInfo, callback) {
     }
     _getRepositoryFile(sources, _path, (err) => {
       if (err) {
-        console.error(`[${new Date().toString()}] ${err.message}`);
+        console.error(`[${(/* @__PURE__ */ new Date()).toString()}] ${err.message}`);
       }
       if (typeof callback === "function") {
         callback(err, sources);
@@ -1046,7 +1052,7 @@ function getRepositoryFile(urlOrPath, additionalInfo, callback) {
               }
             }
             setImmediate(() => _getRepositoryFile(sources3, _path, (err2) => {
-              err2 && console.error(`[${new Date().toString()}] ${err2.message}`);
+              err2 && console.error(`[${(/* @__PURE__ */ new Date()).toString()}] ${err2.message}`);
               typeof callback === "function" && callback(err2, sources3, actualSourcesHash);
             }));
           } else {
@@ -1194,10 +1200,16 @@ function getSystemNpmVersion(callback) {
 const getSystemNpmVersionAsync = promisify(getSystemNpmVersion);
 async function detectPackageManagerWithFallback(cwd) {
   try {
-    return await (0, import_pak.detectPackageManager)(typeof cwd === "string" ? { cwd } : {
-      cwd: isDevServerInstallation() && require2.main?.path || thisDir,
-      setCwdToPackageRoot: true
-    });
+    return await (0, import_pak.detectPackageManager)(typeof cwd === "string" ? (
+      // If a cwd was provided, use it
+      { cwd }
+    ) : (
+      // Otherwise, try to find the ioBroker root dir
+      {
+        cwd: isDevServerInstallation() && require2.main?.path || thisDir,
+        setCwdToPackageRoot: true
+      }
+    ));
   } catch {
   }
   const ioBrokerRootDir = getRootDir();
@@ -1345,7 +1357,7 @@ function generateDefaultCertificates() {
   const cert = pki.createCertificate();
   cert.publicKey = keys.publicKey;
   cert.serialNumber = `0${makeid(17)}`;
-  cert.validity.notBefore = new Date();
+  cert.validity.notBefore = /* @__PURE__ */ new Date();
   cert.validity.notAfter = new Date(Date.now() + MAX_CERT_VALIDITY);
   const subAttrs = [
     { name: "commonName", value: getHostName() },
@@ -1441,7 +1453,7 @@ async function getHostInfo(objects) {
     }
   }
   const cpus = import_node_os.default.cpus();
-  const dateObj = new Date();
+  const dateObj = /* @__PURE__ */ new Date();
   const data = {
     Platform: isDocker() ? "docker" : import_node_os.default.platform(),
     os: process.platform,
@@ -1574,6 +1586,7 @@ function promisify(fn, context, returnArgNames) {
             switch (arguments.length) {
               case 1:
                 return resolve();
+              // Promise<void>
               case 2:
                 return resolve(result);
               default: {
@@ -1608,6 +1621,7 @@ function promisifyNoError(fn, context, returnArgNames) {
           switch (arguments.length) {
             case 0:
               return resolve();
+            // Promise<void>
             case 1:
               return resolve(result);
             default: {
@@ -1949,7 +1963,8 @@ function validateGeneralObjectProperties(obj, extend2) {
   if (obj.type === "state" && obj.common.custom !== void 0 && obj.common.custom !== null && !isObject(obj.common.custom)) {
     throw new Error(`obj.common.custom has an invalid type! Expected "object", received "${typeof obj.common.custom}"`);
   }
-  if (obj.common.states !== null && obj.common.states !== void 0 && !isObject(obj.common.states) && !Array.isArray(obj.common.states)) {
+  if (obj.common.states !== null && // we allow null for deletion TODO: implement https://github.com/ioBroker/ioBroker.js-controller/issues/1735
+  obj.common.states !== void 0 && !isObject(obj.common.states) && !Array.isArray(obj.common.states)) {
     throw new Error(`obj.common.states has an invalid type! Expected "object", received "${typeof obj.common.states}"`);
   }
 }
@@ -2009,7 +2024,9 @@ async function getInstances(adapter, objects, withObjects) {
 }
 function execAsync(command, execOptions) {
   const defaultOptions = {
+    // we do not want to show the node.js window on Windows
     windowsHide: true,
+    // And we want to capture stdout/stderr
     encoding: "utf8"
   };
   return (0, import_promisify_child_process.exec)(command, { ...defaultOptions, ...execOptions });
@@ -2076,6 +2093,7 @@ function getDefaultNodeArgs(mainFile) {
 }
 function getDefaultRequireResolvePaths(callerModule) {
   const ret = [
+    // This is the default for require.resolve
     ...callerModule.paths
   ];
   if (process.execArgv.includes("--preserve-symlinks") && require2.main) {
@@ -2425,14 +2443,14 @@ async function updateLicenses(objects, login, password2) {
           }
         }
       });
-      systemLicenses.native.readTime = new Date().toISOString();
+      systemLicenses.native.readTime = (/* @__PURE__ */ new Date()).toISOString();
       await objects.setObjectAsync("system.licenses", systemLicenses);
       return licenses;
     } catch (err) {
       if (err.message.includes("Authentication required") || err.message.includes("Cannot decode password:")) {
         if (systemLicenses && systemLicenses.native && systemLicenses.native.licenses && systemLicenses.native.licenses.length) {
           systemLicenses.native.licenses = [];
-          systemLicenses.native.readTime = new Date().toISOString();
+          systemLicenses.native.readTime = (/* @__PURE__ */ new Date()).toISOString();
           await objects.setObjectAsync("system.licenses", systemLicenses);
         }
       }
@@ -2441,7 +2459,7 @@ async function updateLicenses(objects, login, password2) {
   } else {
     if (systemLicenses && systemLicenses.native && systemLicenses.native.licenses && systemLicenses.native.licenses.length) {
       systemLicenses.native.licenses = [];
-      systemLicenses.native.readTime = new Date().toISOString();
+      systemLicenses.native.readTime = (/* @__PURE__ */ new Date()).toISOString();
       await objects.setObjectAsync("system.licenses", systemLicenses);
     }
     throw new Error("No password or login");
@@ -2694,6 +2712,7 @@ async function getControllerPid() {
   upToDate,
   updateLicenses,
   validateDataDir,
-  validateGeneralObjectProperties
+  validateGeneralObjectProperties,
+  ...require("../../lib/common/maybeCallback.js")
 });
 //# sourceMappingURL=tools.js.map