@iobroker/js-controller-cli 7.2.3-alpha.8-20260709-8d8c9c5ed → 7.2.3

package/build/cjs/lib/setup/setupSetup.js

@@ -5,7 +5,6 @@ var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
@@ -35,19 +34,20 @@ module.exports = __toCommonJS(setupSetup_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_node_os = __toESM(require("node:os"), 1);
+var import_js_controller_common = require("@iobroker/js-controller-common");
+var import_js_controller_common2 = require("@iobroker/js-controller-common");
+var import_dbConnection = require("../../lib/setup/dbConnection.js");
+var import_setupBackup = require("../../lib/setup/setupBackup.js");
 var import_node_crypto = __toESM(require("node:crypto"), 1);
 var import_deep_clone = __toESM(require("deep-clone"), 1);
-var url = __toESM(require("node:url"), 1);
-var import_node_module = require("node:module");
+var pluginInfos = __toESM(require("../../lib/setup/pluginInfos.js"), 1);
 var import_readline_sync = __toESM(require("readline-sync"), 1);
-var import_js_controller_common = require("@iobroker/js-controller-common");
 var import_tools = require("@iobroker/js-controller-common-db/tools");
+var import_node_os = __toESM(require("node:os"), 1);
 var import_constants = require("@iobroker/js-controller-common-db/constants");
-var import_dbConnection = require("../../lib/setup/dbConnection.js");
-var import_setupBackup = require("../../lib/setup/setupBackup.js");
-var pluginInfos = __toESM(require("../../lib/setup/pluginInfos.js"), 1);
 var import_setupUpload = require("../../lib/setup/setupUpload.js");
+var import_node_module = require("node:module");
+var url = __toESM(require("node:url"), 1);
 const thisDir = url.fileURLToPath(new URL(".", __import_meta_url || `file://${__filename}`));
 const require2 = (0, import_node_module.createRequire)(__import_meta_url || `file://${__filename}`);
 const COLOR_RED = "\x1B[31m";
@@ -56,9 +56,6 @@ const COLOR_RESET = "\x1B[0m";
 const COLOR_GREEN = "\x1B[32m";
 const CONTROLLER_DIR = import_js_controller_common.tools.getControllerDir();
 class Setup {
-  static {
-    __name(this, "Setup");
-  }
   /** Object IDs which are not allowed to exist but could be generated due to errors in the past */
   KNOWN_GARBAGE_OBJECT_IDS = ["null", "undefined"];
   /** Default name for redis sentinels */
@@ -69,9 +66,6 @@ class Setup {
   params;
   cleanDatabase;
   restartController;
-  /**
-   * @param options Handlers for cleaning the DB, exiting and restarting, plus the CLI parameters
-   */
   constructor(options) {
     this.processExit = options.processExit;
     this.params = options.params;
@@ -79,11 +73,6 @@ class Setup {
     this.restartController = options.restartController;
     this.dbSetup = this.dbSetup.bind(this);
   }
-  /**
-   * Print information about the plugins configured for the controller
-   *
-   * @param systemConfig The system.config object, used to read the active repository
-   */
   async informAboutPlugins(systemConfig) {
     if (!this.states) {
       throw new Error("States not set up, call setupObjects first");
@@ -215,13 +204,6 @@ Please DO NOT copy files manually into ioBroker storage directories!`);
       return void callback();
     }
   }
-  /**
-   * Create the initial set of objects and design documents in the database
-   *
-   * @param iopkg The io-package.json of the controller
-   * @param ignoreExisting Whether to proceed even if the config already exists
-   * @param callback Called once the database has been set up
-   */
   async dbSetup(iopkg, ignoreExisting, callback) {
     if (!this.objects) {
       throw new Error("Objects not set up, call setupObjects first");
@@ -346,14 +328,17 @@ Please DO NOT copy files manually into ioBroker storage directories!`);
               console.log(`object ${obj._id} updated`);
             } catch {
             }
-            return this.dbSetup(iopkg, true, callback);
+            this.dbSetup(iopkg, true, callback);
+            return;
           }
         }
-        return this.dbSetup(iopkg, true, callback);
+        this.dbSetup(iopkg, true, callback);
+      } else {
+        this.dbSetup(iopkg, true, callback);
       }
-      return this.dbSetup(iopkg, true, callback);
+    } else {
+      this.dbSetup(iopkg, false, callback);
     }
-    return this.dbSetup(iopkg, false, callback);
   }
   /**
    * Asks the user if he wants to migrate objects if it makes sense and performs migration according to input
@@ -362,14 +347,14 @@ Please DO NOT copy files manually into ioBroker storage directories!`);
    * @param oldConfig - previous config
    */
   async migrateObjects(newConfig, oldConfig) {
-    const oldStatesHasServer = await (0, import_js_controller_common.statesDbHasServer)(oldConfig.states.type);
-    const oldObjectsHasServer = await (0, import_js_controller_common.statesDbHasServer)(oldConfig.objects.type);
-    const newStatesHasServer = await (0, import_js_controller_common.statesDbHasServer)(newConfig.states.type);
-    const newObjectsHasServer = await (0, import_js_controller_common.statesDbHasServer)(newConfig.objects.type);
-    const oldStatesLocalServer = await (0, import_js_controller_common.isLocalStatesDbServer)(oldConfig.states.type, oldConfig.states.host);
-    const oldObjectsLocalServer = await (0, import_js_controller_common.isLocalObjectsDbServer)(oldConfig.objects.type, oldConfig.objects.host);
-    const newStatesLocalServer = await (0, import_js_controller_common.isLocalStatesDbServer)(newConfig.states.type, newConfig.states.host);
-    const newObjectsLocalServer = await (0, import_js_controller_common.isLocalObjectsDbServer)(newConfig.objects.type, newConfig.objects.host);
+    const oldStatesHasServer = await (0, import_js_controller_common2.statesDbHasServer)(oldConfig.states.type);
+    const oldObjectsHasServer = await (0, import_js_controller_common2.statesDbHasServer)(oldConfig.objects.type);
+    const newStatesHasServer = await (0, import_js_controller_common2.statesDbHasServer)(newConfig.states.type);
+    const newObjectsHasServer = await (0, import_js_controller_common2.statesDbHasServer)(newConfig.objects.type);
+    const oldStatesLocalServer = await (0, import_js_controller_common2.isLocalStatesDbServer)(oldConfig.states.type, oldConfig.states.host);
+    const oldObjectsLocalServer = await (0, import_js_controller_common2.isLocalObjectsDbServer)(oldConfig.objects.type, oldConfig.objects.host);
+    const newStatesLocalServer = await (0, import_js_controller_common2.isLocalStatesDbServer)(newConfig.states.type, newConfig.states.host);
+    const newObjectsLocalServer = await (0, import_js_controller_common2.isLocalObjectsDbServer)(newConfig.objects.type, newConfig.objects.host);
     if (oldConfig && (oldConfig.states.type !== newConfig.states.type || oldConfig.objects.type !== newConfig.objects.type || !oldStatesHasServer && oldConfig.states.host !== newConfig.states.host || !oldObjectsHasServer && oldConfig.objects.host !== newConfig.objects.host)) {
       let fromMaster = oldStatesLocalServer || oldObjectsLocalServer;
       let toMaster = newStatesLocalServer || newObjectsLocalServer;
@@ -540,9 +525,6 @@ Please DO NOT copy files manually into ioBroker storage directories!`);
     import_fs_extra.default.writeFileSync(import_js_controller_common.tools.getConfigFileName(), JSON.stringify(newConfig, null, 2));
     return import_js_controller_common.EXIT_CODES.NO_ERROR;
   }
-  /**
-   * Interactively configure the databases and write the configuration file
-   */
   async setupCustom() {
     let config;
     try {
@@ -572,8 +554,8 @@ Please DO NOT copy files manually into ioBroker storage directories!`);
     if (Array.isArray(originalConfig.states.host)) {
       console.log(`  - Sentinel-Master-Name: ${originalConfig.states.sentinelName ? originalConfig.states.sentinelName : this.DEFAULT_SENTINEL_NAME}`);
     }
-    const hasObjectsServer = await (0, import_js_controller_common.objectsDbHasServer)(originalConfig.objects.type);
-    const hasStatesServer = await (0, import_js_controller_common.statesDbHasServer)(originalConfig.states.type);
+    const hasObjectsServer = await (0, import_js_controller_common2.objectsDbHasServer)(originalConfig.objects.type);
+    const hasStatesServer = await (0, import_js_controller_common2.statesDbHasServer)(originalConfig.states.type);
     if (hasObjectsServer || hasStatesServer) {
       console.log(`- Data Directory: ${import_js_controller_common.tools.getDefaultDataDir()}`);
     }
@@ -652,7 +634,7 @@ Please DO NOT copy files manually into ioBroker storage directories!`);
         return import_js_controller_common.EXIT_CODES.INVALID_ARGUMENTS;
       }
     }
-    config.objects = await (0, import_js_controller_common.performObjectsInterview)({ dbType: oType, config: config.objects });
+    config.objects = await (0, import_js_controller_common2.performObjectsInterview)({ dbType: oType, config: config.objects });
     let oSentinelName = null;
     if (oSentinel) {
       const defaultSentinelName = originalConfig.objects.sentinelName ? originalConfig.objects.sentinelName : this.DEFAULT_SENTINEL_NAME;
@@ -712,7 +694,7 @@ Please DO NOT copy files manually into ioBroker storage directories!`);
       sHost = sHost.split(",").map((host) => host.trim());
     }
     let defaultStatesPort = sType === originalConfig.states.type && sHost === originalConfig.states.host ? originalConfig.states.port : sp;
-    const statesHasServer = await (0, import_js_controller_common.statesDbHasServer)(sType);
+    const statesHasServer = await (0, import_js_controller_common2.statesDbHasServer)(sType);
     if (sType === oType && !statesHasServer && sHost === oHost) {
       defaultStatesPort = oPort;
     }
@@ -743,7 +725,7 @@ Please DO NOT copy files manually into ioBroker storage directories!`);
         return import_js_controller_common.EXIT_CODES.INVALID_ARGUMENTS;
       }
     }
-    config.states = await (0, import_js_controller_common.performStatesInterview)({ dbType: sType, config: config.states });
+    config.states = await (0, import_js_controller_common2.performStatesInterview)({ dbType: sType, config: config.states });
     let sSentinelName = null;
     if (sSentinel) {
       const defaultSentinelName = originalConfig.states.sentinelName ? originalConfig.states.sentinelName : oSentinelName && oPort === sPort ? oSentinelName : this.DEFAULT_SENTINEL_NAME;
@@ -753,8 +735,8 @@ Please DO NOT copy files manually into ioBroker storage directories!`);
     }
     let dir;
     let hname;
-    const hasLocalObjectsServer = await (0, import_js_controller_common.isLocalObjectsDbServer)(oType, oHost);
-    const hasLocalStatesServer = await (0, import_js_controller_common.isLocalStatesDbServer)(sType, sHost);
+    const hasLocalObjectsServer = await (0, import_js_controller_common2.isLocalObjectsDbServer)(oType, oHost);
+    const hasLocalStatesServer = await (0, import_js_controller_common2.isLocalStatesDbServer)(sType, sHost);
     if (hasLocalStatesServer || hasLocalObjectsServer) {
       let validDataDir = false;
       while (!validDataDir) {
@@ -926,8 +908,7 @@ Please DO NOT copy files manually into ioBroker storage directories!`);
    * Replace the `controller.js` file in the root directory to work with ESM
    */
   async _fixWindowsControllerJs() {
-    const content = `import('./node_modules/iobroker.js-controller/controller.js');
-`;
+    const content = `import('./node_modules/iobroker.js-controller/controller.js');`;
     const filePath = import_node_path.default.join(import_js_controller_common.tools.getRootDir(), "controller.js");
     try {
       await import_fs_extra.default.writeFile(filePath, content, { encoding: "utf-8" });
@@ -1232,10 +1213,10 @@ require('${import_node_path.default.normalize(`${thisDir}/..`)}/setup').execute(
         console.log(`Non-critical error: ${e.message}`);
       }
     } else if (ignoreIfExist) {
-      this.setupObjects(() => callback?.(), true).catch((e) => console.error(`Cannot setup objects: ${e.message}`));
+      this.setupObjects(() => callback?.(), true);
       return;
     }
-    this.setupObjects(() => callback?.(isCreated)).catch((e) => console.error(`Cannot setup objects: ${e.message}`));
+    this.setupObjects(() => callback?.(isCreated));
   }
 }
 // Annotate the CommonJS export names for ESM import in node: