@iobroker/js-controller-cli 7.0.8-alpha.7-20250928-40cb80c18 → 7.1.0

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

@@ -34,15 +34,20 @@ module.exports = __toCommonJS(setupMultihost_exports);
 var import_fs_extra = __toESM(require("fs-extra"), 1);
 var import_node_path = __toESM(require("node:path"), 1);
 var import_node_readline = __toESM(require("node:readline"), 1);
+var import_readline_sync = __toESM(require("readline-sync"), 1);
+var import_prompt = __toESM(require("prompt"), 1);
 var import_js_controller_common = require("@iobroker/js-controller-common");
 var import_js_controller_common2 = require("@iobroker/js-controller-common");
 var import_multihostClient = require("./multihostClient.js");
-var import_readline_sync = __toESM(require("readline-sync"), 1);
-var import_prompt = __toESM(require("prompt"), 1);
 class Multihost {
   configName;
   params;
   objects;
+  /**
+   * Constructor
+   *
+   * @param options options for the Multihost CLI
+   */
   constructor(options) {
     this.configName = import_js_controller_common.tools.getConfigFileName();
     this.params = options.params || {};
@@ -84,8 +89,7 @@ class Multihost {
   async browse() {
     const mhClient = new import_multihostClient.MHClient();
     try {
-      const res = await mhClient.browse(2e3, !!this.params.debug);
-      return res;
+      return await mhClient.browse(2e3, !!this.params.debug);
     } catch (e) {
       throw new Error(`Multihost discovery client: Cannot browse: ${e.message}`);
     }
@@ -134,8 +138,8 @@ Change "bind 127.0.0.1" to "bind ${import_js_controller_common.tools.getListenAl
     console.log(`Multihost discovery server: ${config.multihostService.enabled ? "enabled" : "disabled"}`);
     console.log(`Discovery authentication:   ${config.multihostService.secure ? "enabled" : "disabled"}`);
     console.log(`Persistent activation:      ${config.multihostService.enabled && config.multihostService.persist ? "enabled" : "disabled"}`);
-    console.log(`Objects:                    ${config.objects.type} on ${config.objects.host}`);
-    console.log(`States:                     ${config.states.type} on ${config.states.host}`);
+    console.log(`Objects:                    ${config.objects.type} on ${Array.isArray(config.objects.host) ? config.objects.host.join(", ") : config.objects.host}`);
+    console.log(`States:                     ${config.states.type} on ${Array.isArray(config.states.host) ? config.states.host.join(", ") : config.states.host}`);
   }
   /**
    * Enables or disables the multihost discovery server in the config json
@@ -151,7 +155,7 @@ Change "bind 127.0.0.1" to "bind ${import_js_controller_common.tools.getListenAl
       changed = true;
       config.multihostService.enabled = true;
       config.multihostService.password = "";
-      console.log("Multihost discovery server activated on this host. If iobroker is currently not running please start befeore trying to discover this host.");
+      console.log("Multihost discovery server activated on this host. If iobroker is currently not running please start before trying to discover this host.");
       console.log("Important: Multihost discovery works with UDP packets. Make sure they are routed correctly in your network. If you use Docker you also need to configure this correctly.");
       if (!this.params.persist) {
         console.log("Multihost discovery will be automatically deactivated after 15 minutes. If you want to activate it permanently use the --persist flag");
@@ -191,12 +195,12 @@ Change "bind 127.0.0.1" to "bind ${import_js_controller_common.tools.getListenAl
           }
         };
         import_prompt.default.start();
-        import_prompt.default.get(schema, (err, password) => {
+        import_prompt.default.get(schema, (_err, password) => {
           if (password?.password) {
             if (password.password !== password.passwordRepeat) {
               callback(new Error("Secret phrases are not equal!"));
             } else {
-              this.objects.getObject("system.config", (err2, obj) => {
+              this.objects.getObject("system.config", (_err2, obj) => {
                 config.multihostService.password = import_js_controller_common.tools.encrypt(obj.native.secret, password.password);
                 this.showMHState(config, changed);
                 callback();
@@ -232,10 +236,10 @@ Change "bind 127.0.0.1" to "bind ${import_js_controller_common.tools.getListenAl
   /**
    * Connect to given MH server
    *
-   * @param mhClient mhclient used for connection
-   * @param ip ip address of server
+   * @param mhClient MultiHost Client used for connection
+   * @param ip IP address of server
    * @param pass password
-   * @param callback
+   * @param callback callback
    */
   connectHelper(mhClient, ip, pass, callback) {
     mhClient.connect(ip, pass, async (err, oObjects, oStates, ipHost) => {
@@ -249,16 +253,28 @@ Change "bind 127.0.0.1" to "bind ${import_js_controller_common.tools.getListenAl
         const hasLocalStatesServer = await (0, import_js_controller_common2.isLocalStatesDbServer)(config.states.type, config.states.host, true);
         if (hasLocalObjectsServer || hasLocalStatesServer) {
           callback(new Error(`IP Address of the remote host is ${import_js_controller_common.tools.getLocalAddress()}. Connections from this host will not be accepted. Please change the configuration of this host to accept remote connections.`));
-        } else {
-          if (import_js_controller_common.tools.isListenAllAddress(config.states.host)) {
+        } else if ((!Array.isArray(config.states.host) || config.states.host.length === 1) && (!Array.isArray(config.objects.host) || config.objects.host.length === 1)) {
+          const sHost = Array.isArray(config.states.host) ? config.states.host[0] : config.states.host;
+          if (import_js_controller_common.tools.isListenAllAddress(sHost)) {
             config.states.host = ipHost ?? "";
           }
-          if (import_js_controller_common.tools.isListenAllAddress(config.objects.host)) {
+          const oHost = Array.isArray(config.objects.host) ? config.objects.host[0] : config.objects.host;
+          if (import_js_controller_common.tools.isListenAllAddress(oHost)) {
             config.objects.host = ipHost ?? "";
           }
           import_fs_extra.default.writeFileSync(this.configName, JSON.stringify(config, null, 2));
           console.log('Config ok. Please restart ioBroker: "iobroker restart"');
           callback();
+        } else {
+          if (Array.isArray(config.states.host)) {
+            config.states.host = config.states.host.map((sHost) => import_js_controller_common.tools.isListenAllAddress(sHost) ? ipHost ?? "" : sHost);
+          }
+          if (Array.isArray(config.objects.host)) {
+            config.objects.host = config.objects.host.map((oHost) => import_js_controller_common.tools.isListenAllAddress(oHost) ? ipHost ?? "" : oHost);
+          }
+          import_fs_extra.default.writeFileSync(this.configName, JSON.stringify(config, null, 2));
+          console.log('Config ok. Please restart ioBroker: "iobroker restart"');
+          callback();
         }
       } else {
         callback(new Error("No configuration received!"));
@@ -270,7 +286,7 @@ Change "bind 127.0.0.1" to "bind ${import_js_controller_common.tools.getListenAl
    *
    * @param index index of host to connect to
    * @param pass password
-   * @param callback
+   * @param callback callback
    */
   async connect(index, pass, callback) {
     if (typeof pass === "function") {

package/build/cjs/lib/setup/setupMultihost.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../src/lib/setup/setupMultihost.ts"],
-  "sourcesContent": ["import fs from 'fs-extra';\nimport path from 'node:path';\nimport readline from 'node:readline';\nimport { tools } from '@iobroker/js-controller-common';\nimport { isLocalObjectsDbServer, isLocalStatesDbServer } from '@iobroker/js-controller-common';\nimport type { Client as ObjectsRedisClient } from '@iobroker/db-objects-redis';\nimport { MHClient, type BrowseResultEntry } from './multihostClient.js';\nimport readlineSync from 'readline-sync';\nimport prompt from 'prompt';\n\ninterface MHParams {\n    secure?: boolean;\n    persist?: boolean;\n    debug?: boolean;\n}\n\nexport interface CLIMultihostOptions {\n    objects: ObjectsRedisClient;\n    params?: MHParams;\n}\n\nexport class Multihost {\n    private readonly configName: string;\n    private params: MHParams;\n    private objects: ObjectsRedisClient;\n\n    constructor(options: CLIMultihostOptions) {\n        this.configName = tools.getConfigFileName();\n        this.params = options.params || {};\n        this.objects = options.objects;\n    }\n\n    /**\n     * Retrieve config (iobroker.json content)\n     */\n    getConfig(): ioBroker.IoBrokerJson {\n        let config;\n        // read actual configuration\n        try {\n            if (fs.existsSync(this.configName)) {\n                config = fs.readJsonSync(this.configName);\n            } else {\n                config = fs.readJsonSync(\n                    path.join(tools.getControllerDir(), 'conf', `${tools.appName.toLowerCase()}-dist.json`),\n                );\n            }\n        } catch {\n            config = fs.readJsonSync(\n                path.join(tools.getControllerDir(), 'conf', `${tools.appName.toLowerCase()}-dist.json`),\n            );\n        }\n        return config;\n    }\n\n    /**\n     * Show hosts on CLI\n     *\n     * @param list list of hosts\n     */\n    showHosts(list: BrowseResultEntry[]): void {\n        if (!list || !list.length) {\n            console.info(\n                'No Multihost server found. Make sure iobroker is running on the host where you enabled multihost discovery (and it is not this host)!',\n            );\n        } else {\n            for (let i = 0; i < list.length; i++) {\n                console.log(\n                    `${i + 1} | ${list[i].hostname!.padStart(20)} | ${list[i].slave ? 'slave' : ' host'} | ${list[\n                        i\n                    ].ip!.padStart(20)} | ${JSON.stringify(list[i].info)}`,\n                );\n            }\n        }\n    }\n\n    /**\n     * Start MH browsing\n     */\n    async browse(): Promise<BrowseResultEntry[]> {\n        const mhClient = new MHClient();\n        try {\n            const res = await mhClient.browse(2_000, !!this.params.debug);\n            return res;\n        } catch (e) {\n            throw new Error(`Multihost discovery client: Cannot browse: ${e.message}`);\n        }\n    }\n\n    /**\n     * Show MH state on CLI\n     *\n     * @param config iob config\n     * @param changed if config has changed\n     */\n    private async showMHState(config: ioBroker.IoBrokerJson, changed: boolean): Promise<void> {\n        if (config.multihostService.enabled) {\n            let warningShown = false;\n\n            const hasLocalObjectsServer = await isLocalObjectsDbServer(config.objects.type, config.objects.host, true);\n\n            if (hasLocalObjectsServer) {\n                console.log('Changing objects server to accept connections on all IP addresses.');\n                config.objects.host = tools.getListenAllAddress();\n                changed = true;\n            } else if (config.objects.type === 'redis') {\n                warningShown = true;\n                console.log(\n                    `Please check the binding of redis service. By default it is only local: http://download.redis.io/redis-stable/redis.conf\\nChange \"bind 127.0.0.1\" to \"bind ${tools.getListenAllAddress()}\" or to others.`,\n                );\n            } else {\n                warningShown = true;\n                console.log(\n                    `Please check the binding of the configured ${config.objects.type} server to allow remote connections.`,\n                );\n            }\n\n            const hasLocalStatesServer = await isLocalStatesDbServer(config.states.type, config.states.host, true);\n\n            if (hasLocalStatesServer) {\n                console.log('Changing states server to accept connections on all IP addresses.');\n                config.states.host = tools.getListenAllAddress();\n                changed = true;\n            } else if (config.states.type === 'redis') {\n                !warningShown &&\n                    console.log(\n                        `Please check the binding of redis service. By default it is only local: http://download.redis.io/redis-stable/redis.conf\\nChange \"bind 127.0.0.1\" to \"bind ${tools.getListenAllAddress()}\" or to others.`,\n                    );\n            } else {\n                !warningShown &&\n                    console.log(\n                        `Please check the binding of the configured ${config.states.type} server to allow remote connections.`,\n                    );\n            }\n        }\n        if (!changed) {\n            console.log('No configuration change needed.');\n        } else {\n            fs.writeFileSync(this.configName, JSON.stringify(config, null, 2));\n            console.log('Please restart ioBroker for the changes to take effect: \"iobroker restart\"');\n        }\n        console.log('\\n');\n        console.log(`Multihost discovery server: ${config.multihostService.enabled ? 'enabled' : 'disabled'}`);\n        console.log(`Discovery authentication:   ${config.multihostService.secure ? 'enabled' : 'disabled'}`);\n        console.log(\n            `Persistent activation:      ${\n                config.multihostService.enabled && config.multihostService.persist ? 'enabled' : 'disabled'\n            }`,\n        );\n        console.log(`Objects:                    ${config.objects.type} on ${config.objects.host}`);\n        console.log(`States:                     ${config.states.type} on ${config.states.host}`);\n    }\n\n    /**\n     * Enables or disables the multihost discovery server in the config json\n     *\n     * @param isEnable - if the server should be activated or deactivated\n     * @param callback - callback function to be executed\n     */\n    enable(isEnable: boolean, callback: (err?: Error) => void): void {\n        let changed = false;\n        const config = this.getConfig();\n        config.multihostService = config.multihostService || { enabled: false, secure: true };\n\n        if (isEnable && !config.multihostService.enabled) {\n            changed = true;\n            config.multihostService.enabled = true;\n            config.multihostService.password = '';\n            console.log(\n                'Multihost discovery server activated on this host. If iobroker is currently not running please start befeore trying to discover this host.',\n            );\n            console.log(\n                'Important: Multihost discovery works with UDP packets. Make sure they are routed correctly in your network. If you use Docker you also need to configure this correctly.',\n            );\n            if (!this.params.persist) {\n                console.log(\n                    'Multihost discovery will be automatically deactivated after 15 minutes. If you want to activate it permanently use the --persist flag',\n                );\n            }\n        } else if (!isEnable && config.multihostService.enabled) {\n            changed = true;\n            config.multihostService.enabled = false;\n            config.multihostService.password = '';\n            console.log('Multihost discovery server deactivated on this host.');\n        }\n        if (this.params.secure === undefined) {\n            this.params.secure = true;\n        }\n\n        this.params.persist = !!this.params.persist;\n\n        if (\n            isEnable &&\n            (config.multihostService.secure !== this.params.secure ||\n                (config.multihostService.secure && !config.multihostService.password) ||\n                config.multihostService.persist !== this.params.persist)\n        ) {\n            changed = true;\n            config.multihostService.secure = this.params.secure;\n            config.multihostService.persist = this.params.persist;\n            console.log(`Discovery authentication ${this.params.secure ? 'activated' : 'deactivated'}.`);\n            if (config.multihostService.secure) {\n                prompt.message = '';\n                prompt.delimiter = '';\n                const schema = {\n                    properties: {\n                        password: {\n                            description: 'Enter secret phrase for connection:',\n                            pattern: /^[^'\"]+$/,\n                            message: 'No \" are allowed',\n                            hidden: true,\n                        },\n                        passwordRepeat: {\n                            description: 'Repeat secret phrase for connection:',\n                            pattern: /^[^'\"]+$/,\n                            message: 'No \" are allowed',\n                            hidden: true,\n                        },\n                    },\n                };\n                prompt.start();\n\n                prompt.get(schema, (err, password) => {\n                    if (password?.password) {\n                        if (password.password !== password.passwordRepeat) {\n                            callback(new Error('Secret phrases are not equal!'));\n                        } else {\n                            this.objects.getObject('system.config', (err, obj) => {\n                                config.multihostService.password = tools.encrypt(\n                                    obj!.native.secret,\n                                    password.password as string,\n                                );\n                                this.showMHState(config, changed);\n                                callback();\n                            });\n                        }\n                    } else {\n                        callback(new Error('No secret phrase entered!'));\n                    }\n                });\n            } else {\n                this.showMHState(config, changed);\n                callback();\n            }\n        } else {\n            this.showMHState(config, changed);\n            callback();\n        }\n    }\n\n    /**\n     * Show the MH status\n     */\n    status(): void {\n        const config = this.getConfig();\n        config.multihostService = config.multihostService || { enabled: false, secure: true };\n        this.showMHState(config, false);\n    }\n\n    /**\n     * Read password from cli\n     */\n    readPassword(): string {\n        return readlineSync.question('Enter secret phrase for connection: ', { hideEchoBack: true });\n    }\n\n    /**\n     * Connect to given MH server\n     *\n     * @param mhClient mhclient used for connection\n     * @param ip ip address of server\n     * @param pass password\n     * @param callback\n     */\n    connectHelper(mhClient: MHClient, ip: string, pass: string, callback: (err?: Error) => void): void {\n        mhClient.connect(ip, pass, async (err, oObjects, oStates, ipHost) => {\n            if (err) {\n                callback(new Error(`Cannot connect to \"${ip}\": ${err.message}`));\n            } else if (oObjects && oStates) {\n                const config = this.getConfig();\n                config.objects = oObjects;\n                config.states = oStates;\n\n                const hasLocalObjectsServer = await isLocalObjectsDbServer(\n                    config.objects.type,\n                    config.objects.host,\n                    true,\n                );\n                const hasLocalStatesServer = await isLocalStatesDbServer(config.states.type, config.states.host, true);\n\n                if (hasLocalObjectsServer || hasLocalStatesServer) {\n                    callback(\n                        new Error(\n                            `IP Address of the remote host is ${tools.getLocalAddress()}. Connections from this host will not be accepted. Please change the configuration of this host to accept remote connections.`,\n                        ),\n                    );\n                } else {\n                    if (tools.isListenAllAddress(config.states.host)) {\n                        // TODO: why we set the remote IP only when the local config allows full connectivity?\n                        config.states.host = ipHost ?? '';\n                    }\n                    if (tools.isListenAllAddress(config.objects.host)) {\n                        // TODO: why we set the remote IP only when the local config allows full connectivity?\n                        config.objects.host = ipHost ?? '';\n                    }\n\n                    fs.writeFileSync(this.configName, JSON.stringify(config, null, 2));\n                    console.log('Config ok. Please restart ioBroker: \"iobroker restart\"');\n                    callback();\n                }\n            } else {\n                callback(new Error('No configuration received!'));\n            }\n        });\n    }\n\n    /**\n     * Connect to MH Server\n     *\n     * @param index index of host to connect to\n     * @param pass password\n     * @param callback\n     */\n    async connect(\n        index: number | null,\n        pass: string | null,\n        callback: (err?: Error, list?: BrowseResultEntry[]) => void,\n    ): Promise<void> {\n        if (typeof pass === 'function') {\n            callback = pass;\n            pass = null;\n        }\n        if (typeof index === 'function') {\n            callback = index;\n            index = null;\n        }\n\n        const mhClient = new MHClient();\n        let list: BrowseResultEntry[];\n\n        try {\n            list = await mhClient.browse(2_000, !!this.params.debug);\n        } catch (e) {\n            callback(new Error(`Cannot browse: ${e.message}`));\n            return;\n        }\n\n        this.showHosts(list);\n\n        if (index !== null && index !== undefined && index > 0) {\n            if (list && index < list.length + 1) {\n                if (!pass) {\n                    callback(new Error('No password defined: please use \"multihost connect <NUMBER> <PASSWORD>\"'));\n                } else {\n                    this.connectHelper(mhClient, list[index - 1].ip!, pass, callback);\n                }\n            } else {\n                callback(new Error(`Invalid index: ${index}`));\n            }\n        } else if (list && list.length) {\n            const rl = readline.createInterface({\n                input: process.stdin,\n                output: process.stdout,\n            });\n            rl.question('Please select host [1]: ', answer => {\n                if (answer === '' || answer === null || answer === undefined) {\n                    index = 1;\n                }\n                index = parseInt(answer, 10) - 1;\n                const listEntry = list[index];\n                if (!listEntry) {\n                    rl.close();\n                    callback(new Error(`Invalid index: ${answer}`));\n                } else {\n                    if (listEntry.auth) {\n                        const password = this.readPassword();\n                        if (password) {\n                            this.connectHelper(mhClient, listEntry.ip!, password, callback);\n                        } else {\n                            callback(new Error('No password entered!'));\n                        }\n                    } else {\n                        this.connectHelper(mhClient, listEntry.ip!, '', callback);\n                    }\n                }\n            });\n        } else {\n            callback(undefined, list);\n        }\n    }\n}\n"],
-  "mappings": "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",
-  "names": ["import_js_controller_common", "fs", "path", "prompt", "err", "readlineSync", "readline"]
+  "sourcesContent": ["import fs from 'fs-extra';\nimport path from 'node:path';\nimport readline from 'node:readline';\nimport readlineSync from 'readline-sync';\nimport prompt from 'prompt';\n\nimport { tools } from '@iobroker/js-controller-common';\nimport { isLocalObjectsDbServer, isLocalStatesDbServer } from '@iobroker/js-controller-common';\nimport type { Client as ObjectsRedisClient } from '@iobroker/db-objects-redis';\nimport { MHClient, type BrowseResultEntry } from './multihostClient.js';\n\ninterface MHParams {\n    secure?: boolean;\n    persist?: boolean;\n    debug?: boolean;\n}\n\n/** Options for Multihost CLI */\nexport interface CLIMultihostOptions {\n    /** Redis client for objects DB */\n    objects: ObjectsRedisClient;\n    /** Additional parameters */\n    params?: MHParams;\n}\n\n/**\n *  Multihost CLI class\n *  Handles multihost related commands\n */\nexport class Multihost {\n    private readonly configName: string;\n    private params: MHParams;\n    private objects: ObjectsRedisClient;\n\n    /**\n     * Constructor\n     *\n     * @param options options for the Multihost CLI\n     */\n    constructor(options: CLIMultihostOptions) {\n        this.configName = tools.getConfigFileName();\n        this.params = options.params || {};\n        this.objects = options.objects;\n    }\n\n    /**\n     * Retrieve config (iobroker.json content)\n     */\n    getConfig(): ioBroker.IoBrokerJson {\n        let config;\n        // read actual configuration\n        try {\n            if (fs.existsSync(this.configName)) {\n                config = fs.readJsonSync(this.configName);\n            } else {\n                config = fs.readJsonSync(\n                    path.join(tools.getControllerDir(), 'conf', `${tools.appName.toLowerCase()}-dist.json`),\n                );\n            }\n        } catch {\n            config = fs.readJsonSync(\n                path.join(tools.getControllerDir(), 'conf', `${tools.appName.toLowerCase()}-dist.json`),\n            );\n        }\n        return config;\n    }\n\n    /**\n     * Show hosts on CLI\n     *\n     * @param list list of hosts\n     */\n    showHosts(list: BrowseResultEntry[]): void {\n        if (!list || !list.length) {\n            console.info(\n                'No Multihost server found. Make sure iobroker is running on the host where you enabled multihost discovery (and it is not this host)!',\n            );\n        } else {\n            for (let i = 0; i < list.length; i++) {\n                console.log(\n                    `${i + 1} | ${list[i].hostname!.padStart(20)} | ${list[i].slave ? 'slave' : ' host'} | ${list[\n                        i\n                    ].ip!.padStart(20)} | ${JSON.stringify(list[i].info)}`,\n                );\n            }\n        }\n    }\n\n    /**\n     * Start MH browsing\n     */\n    async browse(): Promise<BrowseResultEntry[]> {\n        const mhClient = new MHClient();\n        try {\n            return await mhClient.browse(2_000, !!this.params.debug);\n        } catch (e) {\n            throw new Error(`Multihost discovery client: Cannot browse: ${e.message}`);\n        }\n    }\n\n    /**\n     * Show MH state on CLI\n     *\n     * @param config iob config\n     * @param changed if config has changed\n     */\n    private async showMHState(config: ioBroker.IoBrokerJson, changed: boolean): Promise<void> {\n        if (config.multihostService.enabled) {\n            let warningShown = false;\n\n            const hasLocalObjectsServer = await isLocalObjectsDbServer(config.objects.type, config.objects.host, true);\n\n            if (hasLocalObjectsServer) {\n                console.log('Changing objects server to accept connections on all IP addresses.');\n                config.objects.host = tools.getListenAllAddress();\n                changed = true;\n            } else if (config.objects.type === 'redis') {\n                warningShown = true;\n                console.log(\n                    `Please check the binding of redis service. By default it is only local: http://download.redis.io/redis-stable/redis.conf\\nChange \"bind 127.0.0.1\" to \"bind ${tools.getListenAllAddress()}\" or to others.`,\n                );\n            } else {\n                warningShown = true;\n                console.log(\n                    `Please check the binding of the configured ${config.objects.type} server to allow remote connections.`,\n                );\n            }\n\n            const hasLocalStatesServer = await isLocalStatesDbServer(config.states.type, config.states.host, true);\n\n            if (hasLocalStatesServer) {\n                console.log('Changing states server to accept connections on all IP addresses.');\n                config.states.host = tools.getListenAllAddress();\n                changed = true;\n            } else if (config.states.type === 'redis') {\n                !warningShown &&\n                    console.log(\n                        `Please check the binding of redis service. By default it is only local: http://download.redis.io/redis-stable/redis.conf\\nChange \"bind 127.0.0.1\" to \"bind ${tools.getListenAllAddress()}\" or to others.`,\n                    );\n            } else {\n                !warningShown &&\n                    console.log(\n                        `Please check the binding of the configured ${config.states.type} server to allow remote connections.`,\n                    );\n            }\n        }\n        if (!changed) {\n            console.log('No configuration change needed.');\n        } else {\n            fs.writeFileSync(this.configName, JSON.stringify(config, null, 2));\n            console.log('Please restart ioBroker for the changes to take effect: \"iobroker restart\"');\n        }\n        console.log('\\n');\n        console.log(`Multihost discovery server: ${config.multihostService.enabled ? 'enabled' : 'disabled'}`);\n        console.log(`Discovery authentication:   ${config.multihostService.secure ? 'enabled' : 'disabled'}`);\n        console.log(\n            `Persistent activation:      ${\n                config.multihostService.enabled && config.multihostService.persist ? 'enabled' : 'disabled'\n            }`,\n        );\n        console.log(\n            `Objects:                    ${config.objects.type} on ${Array.isArray(config.objects.host) ? config.objects.host.join(', ') : config.objects.host}`,\n        );\n        console.log(\n            `States:                     ${config.states.type} on ${Array.isArray(config.states.host) ? config.states.host.join(', ') : config.states.host}`,\n        );\n    }\n\n    /**\n     * Enables or disables the multihost discovery server in the config json\n     *\n     * @param isEnable - if the server should be activated or deactivated\n     * @param callback - callback function to be executed\n     */\n    enable(isEnable: boolean, callback: (err?: Error) => void): void {\n        let changed = false;\n        const config = this.getConfig();\n        config.multihostService = config.multihostService || { enabled: false, secure: true };\n\n        if (isEnable && !config.multihostService.enabled) {\n            changed = true;\n            config.multihostService.enabled = true;\n            config.multihostService.password = '';\n            console.log(\n                'Multihost discovery server activated on this host. If iobroker is currently not running please start before trying to discover this host.',\n            );\n            console.log(\n                'Important: Multihost discovery works with UDP packets. Make sure they are routed correctly in your network. If you use Docker you also need to configure this correctly.',\n            );\n            if (!this.params.persist) {\n                console.log(\n                    'Multihost discovery will be automatically deactivated after 15 minutes. If you want to activate it permanently use the --persist flag',\n                );\n            }\n        } else if (!isEnable && config.multihostService.enabled) {\n            changed = true;\n            config.multihostService.enabled = false;\n            config.multihostService.password = '';\n            console.log('Multihost discovery server deactivated on this host.');\n        }\n        if (this.params.secure === undefined) {\n            this.params.secure = true;\n        }\n\n        this.params.persist = !!this.params.persist;\n\n        if (\n            isEnable &&\n            (config.multihostService.secure !== this.params.secure ||\n                (config.multihostService.secure && !config.multihostService.password) ||\n                config.multihostService.persist !== this.params.persist)\n        ) {\n            changed = true;\n            config.multihostService.secure = this.params.secure;\n            config.multihostService.persist = this.params.persist;\n            console.log(`Discovery authentication ${this.params.secure ? 'activated' : 'deactivated'}.`);\n            if (config.multihostService.secure) {\n                prompt.message = '';\n                prompt.delimiter = '';\n                const schema = {\n                    properties: {\n                        password: {\n                            description: 'Enter secret phrase for connection:',\n                            pattern: /^[^'\"]+$/,\n                            message: 'No \" are allowed',\n                            hidden: true,\n                        },\n                        passwordRepeat: {\n                            description: 'Repeat secret phrase for connection:',\n                            pattern: /^[^'\"]+$/,\n                            message: 'No \" are allowed',\n                            hidden: true,\n                        },\n                    },\n                };\n                prompt.start();\n\n                prompt.get(schema, (_err, password) => {\n                    if (password?.password) {\n                        if (password.password !== password.passwordRepeat) {\n                            callback(new Error('Secret phrases are not equal!'));\n                        } else {\n                            this.objects.getObject('system.config', (_err, obj) => {\n                                config.multihostService.password = tools.encrypt(\n                                    obj!.native.secret,\n                                    password.password as string,\n                                );\n                                this.showMHState(config, changed);\n                                callback();\n                            });\n                        }\n                    } else {\n                        callback(new Error('No secret phrase entered!'));\n                    }\n                });\n            } else {\n                this.showMHState(config, changed);\n                callback();\n            }\n        } else {\n            this.showMHState(config, changed);\n            callback();\n        }\n    }\n\n    /**\n     * Show the MH status\n     */\n    status(): void {\n        const config = this.getConfig();\n        config.multihostService = config.multihostService || { enabled: false, secure: true };\n        this.showMHState(config, false);\n    }\n\n    /**\n     * Read password from cli\n     */\n    readPassword(): string {\n        return readlineSync.question('Enter secret phrase for connection: ', { hideEchoBack: true });\n    }\n\n    /**\n     * Connect to given MH server\n     *\n     * @param mhClient MultiHost Client used for connection\n     * @param ip IP address of server\n     * @param pass password\n     * @param callback callback\n     */\n    connectHelper(mhClient: MHClient, ip: string, pass: string, callback: (err?: Error) => void): void {\n        mhClient.connect(ip, pass, async (err, oObjects, oStates, ipHost) => {\n            if (err) {\n                callback(new Error(`Cannot connect to \"${ip}\": ${err.message}`));\n            } else if (oObjects && oStates) {\n                const config = this.getConfig();\n                config.objects = oObjects;\n                config.states = oStates;\n\n                const hasLocalObjectsServer = await isLocalObjectsDbServer(\n                    config.objects.type,\n                    config.objects.host,\n                    true,\n                );\n                const hasLocalStatesServer = await isLocalStatesDbServer(config.states.type, config.states.host, true);\n\n                if (hasLocalObjectsServer || hasLocalStatesServer) {\n                    callback(\n                        new Error(\n                            `IP Address of the remote host is ${tools.getLocalAddress()}. Connections from this host will not be accepted. Please change the configuration of this host to accept remote connections.`,\n                        ),\n                    );\n                } else if (\n                    (!Array.isArray(config.states.host) || config.states.host.length === 1) &&\n                    (!Array.isArray(config.objects.host) || config.objects.host.length === 1)\n                ) {\n                    const sHost = Array.isArray(config.states.host) ? config.states.host[0] : config.states.host;\n                    // If server delivers 0.0.0.0 or ::, set to actual IP of the host\n                    if (tools.isListenAllAddress(sHost)) {\n                        config.states.host = ipHost ?? '';\n                    }\n                    const oHost = Array.isArray(config.objects.host) ? config.objects.host[0] : config.objects.host;\n                    // If server delivers 0.0.0.0 or ::, set to actual IP of the host\n                    if (tools.isListenAllAddress(oHost)) {\n                        config.objects.host = ipHost ?? '';\n                    }\n\n                    fs.writeFileSync(this.configName, JSON.stringify(config, null, 2));\n                    console.log('Config ok. Please restart ioBroker: \"iobroker restart\"');\n                    callback();\n                } else {\n                    // Find if any of the hosts is \"listen all\" or reachable\n                    if (Array.isArray(config.states.host)) {\n                        config.states.host = config.states.host.map((sHost: string) =>\n                            tools.isListenAllAddress(sHost) ? (ipHost ?? '') : sHost,\n                        );\n                    }\n                    if (Array.isArray(config.objects.host)) {\n                        config.objects.host = config.objects.host.map((oHost: string) =>\n                            tools.isListenAllAddress(oHost) ? (ipHost ?? '') : oHost,\n                        );\n                    }\n\n                    fs.writeFileSync(this.configName, JSON.stringify(config, null, 2));\n                    console.log('Config ok. Please restart ioBroker: \"iobroker restart\"');\n                    callback();\n                }\n            } else {\n                callback(new Error('No configuration received!'));\n            }\n        });\n    }\n\n    /**\n     * Connect to MH Server\n     *\n     * @param index index of host to connect to\n     * @param pass password\n     * @param callback callback\n     */\n    async connect(\n        index: number | null,\n        pass: string | null,\n        callback: (err?: Error, list?: BrowseResultEntry[]) => void,\n    ): Promise<void> {\n        if (typeof pass === 'function') {\n            callback = pass;\n            pass = null;\n        }\n        if (typeof index === 'function') {\n            callback = index;\n            index = null;\n        }\n\n        const mhClient = new MHClient();\n        let list: BrowseResultEntry[];\n\n        try {\n            list = await mhClient.browse(2_000, !!this.params.debug);\n        } catch (e) {\n            callback(new Error(`Cannot browse: ${e.message}`));\n            return;\n        }\n\n        this.showHosts(list);\n\n        if (index !== null && index !== undefined && index > 0) {\n            if (list && index < list.length + 1) {\n                if (!pass) {\n                    callback(new Error('No password defined: please use \"multihost connect <NUMBER> <PASSWORD>\"'));\n                } else {\n                    this.connectHelper(mhClient, list[index - 1].ip!, pass, callback);\n                }\n            } else {\n                callback(new Error(`Invalid index: ${index}`));\n            }\n        } else if (list && list.length) {\n            const rl = readline.createInterface({\n                input: process.stdin,\n                output: process.stdout,\n            });\n            rl.question('Please select host [1]: ', answer => {\n                if (answer === '' || answer === null || answer === undefined) {\n                    index = 1;\n                }\n                index = parseInt(answer, 10) - 1;\n                const listEntry = list[index];\n                if (!listEntry) {\n                    rl.close();\n                    callback(new Error(`Invalid index: ${answer}`));\n                } else {\n                    if (listEntry.auth) {\n                        const password = this.readPassword();\n                        if (password) {\n                            this.connectHelper(mhClient, listEntry.ip!, password, callback);\n                        } else {\n                            callback(new Error('No password entered!'));\n                        }\n                    } else {\n                        this.connectHelper(mhClient, listEntry.ip!, '', callback);\n                    }\n                }\n            });\n        } else {\n            callback(undefined, list);\n        }\n    }\n}\n"],
+  "mappings": "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",
+  "names": ["import_js_controller_common", "fs", "path", "prompt", "_err", "readlineSync", "readline"]
 }

package/build/cjs/lib/setup/setupSetup.d.ts

@@ -1,11 +1,3 @@
-/**
- *      Setup
- *
- *      Copyright 2013-2024 bluefox <dogafox@gmail.com>
- *
- *      MIT License
- *
- */
 import type { CleanDatabaseHandler, IoPackage, ProcessExitCallback, RestartController } from '../../lib/_Types.js';
 import { EXIT_CODES } from '@iobroker/js-controller-common';
 export interface CLISetupOptions {
@@ -75,9 +67,9 @@ export declare class Setup {
      */
     private _ensureHostObject;
     /**
-     * Add adapter-core in supported version in the overrides field of the root package.json and call install there to apply it
+     * Add or update adapter-core in supported version in the overrides field of the root package.json and call install there to apply it
      */
-    private addAdapterCoreRequirement;
+    private addOrUpdateAdapterCoreRequirement;
     /**
      * Create the adapters object per host if not yet existing
      */
@@ -111,7 +103,7 @@ export declare class Setup {
      */
     private _cleanupInvalidGroupAssignments;
     /**
-     * Setup the installation with config file, host object, scripts etc
+     * Set up the installation with config file, host object, scripts etc
      *
      * @param options setup options
      */

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

@@ -59,7 +59,7 @@ class 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"];
   /** Adapter core version supported by this js-controller */
-  SUPPORTED_ADAPTER_CORE_VERSION = "^3.2.1";
+  SUPPORTED_ADAPTER_CORE_VERSION = "^3.3.2";
   /** Default name for redis sentinels */
   DEFAULT_SENTINEL_NAME = "mymaster";
   processExit;
@@ -167,7 +167,7 @@ class Setup {
       await this._fixWindowsControllerJs();
     }
     try {
-      await this.addAdapterCoreRequirement();
+      await this.addOrUpdateAdapterCoreRequirement();
     } catch (e) {
       console.error(`Could not add "@iobroker/adapter-core" requirement: ${e.message}`);
     }
@@ -262,7 +262,7 @@ Please DO NOT copy files manually into ioBroker storage directories!`);
     }
     if (!configObj.native?.secret) {
       const buf = import_node_crypto.default.randomBytes(24);
-      configObj.native = configObj.native || {};
+      configObj.native ||= {};
       configObj.native.secret = buf.toString("hex");
       configObj.from = `system.host.${import_js_controller_common.tools.getHostName()}.cli`;
       configObj.ts = Date.now();
@@ -295,14 +295,14 @@ Please DO NOT copy files manually into ioBroker storage directories!`);
       let certObj;
       if (iopkg?.objects) {
         for (const obj of iopkg.objects) {
-          if (obj && obj._id === "system.certificates") {
+          if (obj?._id === "system.certificates") {
             certObj = obj;
             break;
           }
         }
       }
       if (certObj) {
-        let obj;
+        let obj = null;
         try {
           obj = await this.objects.getObjectAsync("system.certificates");
         } catch {
@@ -529,31 +529,30 @@ Please DO NOT copy files manually into ioBroker storage directories!`);
   }
   async setupCustom() {
     let config;
-    let originalConfig;
     try {
       if (import_fs_extra.default.existsSync(import_js_controller_common.tools.getConfigFileName())) {
         config = import_fs_extra.default.readJsonSync(import_js_controller_common.tools.getConfigFileName());
-        originalConfig = (0, import_deep_clone.default)(config);
       } else {
         config = import_fs_extra.default.readJsonSync(import_node_path.default.join(CONTROLLER_DIR, "conf", `${import_js_controller_common.tools.appName.toLowerCase()}-dist.json`));
       }
     } catch {
       config = import_fs_extra.default.readJsonSync(import_node_path.default.join(CONTROLLER_DIR, "conf", `${import_js_controller_common.tools.appName.toLowerCase()}-dist.json`));
     }
+    const originalConfig = (0, import_deep_clone.default)(config);
     const currentObjectsType = originalConfig.objects.type || "jsonl";
     const currentStatesType = originalConfig.states.type || "jsonl";
     console.log("Current configuration:");
     console.log("- Objects database:");
     console.log(`  - Type: ${originalConfig.objects.type}`);
-    console.log(`  - Host/Unix Socket: ${originalConfig.objects.host}`);
-    console.log(`  - Port: ${originalConfig.objects.port}`);
+    console.log(`  - Host/Unix Socket: ${Array.isArray(originalConfig.objects.host) ? originalConfig.objects.host.join(",") : originalConfig.objects.host}`);
+    console.log(`  - Port: ${Array.isArray(originalConfig.objects.port) ? originalConfig.objects.port.join(",") : originalConfig.objects.port}`);
     if (Array.isArray(originalConfig.objects.host)) {
       console.log(`  - Sentinel-Master-Name: ${originalConfig.objects.sentinelName ? originalConfig.objects.sentinelName : this.DEFAULT_SENTINEL_NAME}`);
     }
     console.log("- States database:");
     console.log(`  - Type: ${originalConfig.states.type}`);
-    console.log(`  - Host/Unix Socket: ${originalConfig.states.host}`);
-    console.log(`  - Port: ${originalConfig.states.port}`);
+    console.log(`  - Host/Unix Socket: ${Array.isArray(originalConfig.states.host) ? originalConfig.states.host.join(",") : originalConfig.states.host}`);
+    console.log(`  - Port: ${Array.isArray(originalConfig.states.port) ? originalConfig.states.port.join(",") : originalConfig.states.port}`);
     if (Array.isArray(originalConfig.states.host)) {
       console.log(`  - Sentinel-Master-Name: ${originalConfig.states.sentinelName ? originalConfig.states.sentinelName : this.DEFAULT_SENTINEL_NAME}`);
     }
@@ -562,37 +561,37 @@ Please DO NOT copy files manually into ioBroker storage directories!`);
     if (hasObjectsServer || hasStatesServer) {
       console.log(`- Data Directory: ${import_js_controller_common.tools.getDefaultDataDir()}`);
     }
-    if (originalConfig && originalConfig.system && originalConfig.system.hostname) {
+    if (originalConfig?.system?.hostname) {
       console.log(`- Host name: ${originalConfig.system.hostname}`);
     }
     console.log("");
-    let otype = import_readline_sync.default.question(`Type of objects DB [(j)sonl, (f)ile, (r)edis, ...], default [${currentObjectsType}]: `, {
+    let oType = import_readline_sync.default.question(`Type of objects DB [(j)sonl, (f)ile, (r)edis, ...], default [${currentObjectsType}]: `, {
       defaultInput: currentObjectsType
     });
-    otype = otype.toLowerCase();
-    if (otype === "r") {
-      otype = "redis";
-    } else if (otype === "f") {
-      otype = "file";
-    } else if (otype === "j") {
-      otype = "jsonl";
+    oType = oType.toLowerCase();
+    if (oType === "r") {
+      oType = "redis";
+    } else if (oType === "f") {
+      oType = "file";
+    } else if (oType === "j") {
+      oType = "jsonl";
     }
     let getDefaultObjectsPort;
     try {
-      const path2 = require2.resolve(`@iobroker/db-objects-${otype}`);
+      const path2 = require2.resolve(`@iobroker/db-objects-${oType}`);
       getDefaultObjectsPort = require2(path2).getDefaultPort;
     } catch {
-      console.log(`${COLOR_RED}Unknown objects type: ${otype}${COLOR_RESET}`);
-      if (otype !== "file" && otype !== "redis") {
+      console.log(`${COLOR_RED}Unknown objects type: ${oType}${COLOR_RESET}`);
+      if (oType !== "file" && oType !== "redis") {
         console.log(COLOR_YELLOW);
         console.log(`Please check that the objects db type you entered is really correct!`);
-        console.log(`If yes please use "npm i @iobroker/db-objects-${otype}" to install it manually.`);
+        console.log(`If yes please use "npm i @iobroker/db-objects-${oType}" to install it manually.`);
         console.log(`You also need to make sure you stay up to date with this package in the future!`);
         console.log(COLOR_RESET);
       }
       return import_js_controller_common.EXIT_CODES.INVALID_ARGUMENTS;
     }
-    if (otype === "redis" && originalConfig.objects.type !== "redis") {
+    if (oType === "redis" && originalConfig.objects.type !== "redis") {
       console.log(COLOR_YELLOW);
       console.log("When Objects and Files are stored in a Redis database please consider the following:");
       console.log("1. All data will be stored in RAM, make sure to have enough free RAM available!");
@@ -600,18 +599,18 @@ Please DO NOT copy files manually into ioBroker storage directories!`);
       console.log("3. The Redis persistence files can get big, make sure not to use an SD card to store them.");
       console.log(COLOR_RESET);
     }
-    const defaultObjectsHost = otype === originalConfig.objects.type ? originalConfig.objects.host : import_js_controller_common.tools.getLocalAddress();
-    let oHost = import_readline_sync.default.question(`Host / Unix Socket of objects DB(${otype}), default[${Array.isArray(defaultObjectsHost) ? defaultObjectsHost.join(",") : defaultObjectsHost}]: `, {
+    const defaultObjectsHost = oType === originalConfig.objects.type ? originalConfig.objects.host : import_js_controller_common.tools.getLocalAddress();
+    let oHost = import_readline_sync.default.question(`Host / Unix Socket of objects DB(${oType}), default[${Array.isArray(defaultObjectsHost) ? defaultObjectsHost.join(",") : defaultObjectsHost}]: `, {
       defaultInput: Array.isArray(defaultObjectsHost) ? defaultObjectsHost.join(",") : defaultObjectsHost
     });
     oHost = oHost.toLowerCase();
     const op = getDefaultObjectsPort(oHost);
-    const oSentinel = otype === "redis" && oHost.includes(",");
+    const oSentinel = oType === "redis" && oHost.includes(",");
     if (oSentinel) {
       oHost = oHost.split(",").map((host) => host.trim());
     }
-    const defaultObjectsPort = otype === originalConfig.objects.type && oHost === originalConfig.objects.host ? originalConfig.objects.port : op;
-    const userObjPort = import_readline_sync.default.question(`Port of objects DB(${otype}), default[${Array.isArray(defaultObjectsPort) ? defaultObjectsPort.join(",") : defaultObjectsPort}]: `, {
+    const defaultObjectsPort = oType === originalConfig.objects.type && oHost === originalConfig.objects.host ? originalConfig.objects.port : op;
+    const userObjPort = import_readline_sync.default.question(`Port of objects DB(${oType}), default[${Array.isArray(defaultObjectsPort) ? defaultObjectsPort.join(",") : defaultObjectsPort}]: `, {
       defaultInput: Array.isArray(defaultObjectsPort) ? defaultObjectsPort.join(",") : defaultObjectsPort,
       limit: /^[0-9, ]+$/
     });
@@ -637,7 +636,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_common2.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;
@@ -647,61 +646,61 @@ Please DO NOT copy files manually into ioBroker storage directories!`);
     }
     let defaultStatesType = currentStatesType;
     try {
-      require2.resolve(`@iobroker/db-states-${otype}`);
-      defaultStatesType = otype;
+      require2.resolve(`@iobroker/db-states-${oType}`);
+      defaultStatesType = oType;
     } catch {
     }
-    let stype = import_readline_sync.default.question(`Type of states DB [(j)sonl, (f)file, (r)edis, ...], default [${defaultStatesType}]: `, {
+    let sType = import_readline_sync.default.question(`Type of states DB [(j)sonl, (f)file, (r)edis, ...], default [${defaultStatesType}]: `, {
       defaultInput: defaultStatesType
     });
-    stype = stype.toLowerCase();
-    if (stype === "r") {
-      stype = "redis";
-    } else if (stype === "f") {
-      stype = "file";
-    } else if (stype === "j") {
-      stype = "jsonl";
+    sType = sType.toLowerCase();
+    if (sType === "r") {
+      sType = "redis";
+    } else if (sType === "f") {
+      sType = "file";
+    } else if (sType === "j") {
+      sType = "jsonl";
     }
     let getDefaultStatesPort;
     try {
-      const path2 = require2.resolve(`@iobroker/db-states-${stype}`);
+      const path2 = require2.resolve(`@iobroker/db-states-${sType}`);
       getDefaultStatesPort = require2(path2).getDefaultPort;
     } catch {
-      console.log(`${COLOR_RED}Unknown states type: ${stype}${COLOR_RESET}`);
-      if (stype !== "file" && stype !== "redis") {
+      console.log(`${COLOR_RED}Unknown states type: ${sType}${COLOR_RESET}`);
+      if (sType !== "file" && sType !== "redis") {
         console.log(COLOR_YELLOW);
         console.log(`Please check that the states db type you entered is really correct!`);
-        console.log(`If yes please use "npm i @iobroker/db-states-${stype}" to install it manually.`);
+        console.log(`If yes please use "npm i @iobroker/db-states-${sType}" to install it manually.`);
         console.log(`You also need to make sure you stay up to date with this package in the future!`);
         console.log(COLOR_RESET);
       }
       return import_js_controller_common.EXIT_CODES.INVALID_ARGUMENTS;
     }
-    if (stype === "redis" && originalConfig.states.type !== "redis" && otype !== "redis") {
+    if (sType === "redis" && originalConfig.states.type !== "redis" && oType !== "redis") {
       console.log(COLOR_YELLOW);
       console.log("When States are stored in a Redis database please make sure to configure Redis");
       console.log("persistence to make sure a Redis problem will not cause data loss!");
       console.log(COLOR_RESET);
     }
-    let defaultStatesHost = stype === originalConfig.states.type ? originalConfig.states.host : oHost || import_js_controller_common.tools.getLocalAddress();
-    if (stype === otype) {
+    let defaultStatesHost = sType === originalConfig.states.type ? originalConfig.states.host : oHost || import_js_controller_common.tools.getLocalAddress();
+    if (sType === oType) {
       defaultStatesHost = oHost;
     }
-    let sHost = import_readline_sync.default.question(`Host / Unix Socket of states DB (${stype}), default[${Array.isArray(defaultStatesHost) ? defaultStatesHost.join(",") : defaultStatesHost}]: `, {
+    let sHost = import_readline_sync.default.question(`Host / Unix Socket of states DB (${sType}), default[${Array.isArray(defaultStatesHost) ? defaultStatesHost.join(",") : defaultStatesHost}]: `, {
       defaultInput: Array.isArray(defaultStatesHost) ? defaultStatesHost.join(",") : defaultStatesHost
     });
     sHost = sHost.toLowerCase();
     const sp = getDefaultStatesPort(sHost);
-    const sSentinel = stype === "redis" && sHost.includes(",");
+    const sSentinel = sType === "redis" && sHost.includes(",");
     if (sSentinel) {
       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_common2.statesDbHasServer)(stype);
-    if (stype === otype && !statesHasServer && sHost === oHost) {
+    let defaultStatesPort = sType === originalConfig.states.type && sHost === originalConfig.states.host ? originalConfig.states.port : sp;
+    const statesHasServer = await (0, import_js_controller_common2.statesDbHasServer)(sType);
+    if (sType === oType && !statesHasServer && sHost === oHost) {
       defaultStatesPort = oPort;
     }
-    const userStatePort = import_readline_sync.default.question(`Port of states DB (${stype}), default[${Array.isArray(defaultStatesPort) ? defaultStatesPort.join(",") : defaultStatesPort}]: `, {
+    const userStatePort = import_readline_sync.default.question(`Port of states DB (${sType}), default[${Array.isArray(defaultStatesPort) ? defaultStatesPort.join(",") : defaultStatesPort}]: `, {
       defaultInput: Array.isArray(defaultStatesPort) ? defaultStatesPort.join(",") : defaultStatesPort,
       limit: /^[0-9, ]+$/
     });
@@ -728,7 +727,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_common2.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;
@@ -738,8 +737,8 @@ Please DO NOT copy files manually into ioBroker storage directories!`);
     }
     let dir;
     let hname;
-    const hasLocalObjectsServer = await (0, import_js_controller_common2.isLocalObjectsDbServer)(otype, oHost);
-    const hasLocalStatesServer = await (0, import_js_controller_common2.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) {
@@ -765,13 +764,13 @@ Please DO NOT copy files manually into ioBroker storage directories!`);
       console.log(`${COLOR_RED}Invalid host name: ${hname}${COLOR_RESET}`);
       return import_js_controller_common.EXIT_CODES.INVALID_ARGUMENTS;
     }
-    config.system = config.system || {};
+    config.system ||= {};
     config.system.hostname = hname;
     config.objects.host = oHost;
-    config.objects.type = otype;
+    config.objects.type = oType;
     config.objects.port = oPort;
     config.states.host = sHost;
-    config.states.type = stype;
+    config.states.type = sType;
     config.states.port = sPort;
     config.states.dataDir = void 0;
     config.objects.dataDir = void 0;
@@ -787,8 +786,7 @@ Please DO NOT copy files manually into ioBroker storage directories!`);
     if (config.states.type === "redis" && sSentinel && sSentinelName && sSentinelName !== this.DEFAULT_SENTINEL_NAME) {
       config.states.sentinelName = sSentinelName;
     }
-    const exitCode = await this.migrateObjects(config, originalConfig);
-    return exitCode;
+    return await this.migrateObjects(config, originalConfig);
   }
   /**
    * Checks if single host setup and if so migrates and activates Redis Sets Usage
@@ -825,9 +823,9 @@ Please DO NOT copy files manually into ioBroker storage directories!`);
     }
   }
   /**
-   * Add adapter-core in supported version in the overrides field of the root package.json and call install there to apply it
+   * Add or update adapter-core in supported version in the overrides field of the root package.json and call install there to apply it
    */
-  async addAdapterCoreRequirement() {
+  async addOrUpdateAdapterCoreRequirement() {
     if (import_js_controller_common.tools.isDevInstallation()) {
       return;
     }
@@ -1099,7 +1097,7 @@ Please DO NOT copy files manually into ioBroker storage directories!`);
     }
   }
   /**
-   * Setup the installation with config file, host object, scripts etc
+   * Set up the installation with config file, host object, scripts etc
    *
    * @param options setup options
    */
@@ -1214,19 +1212,10 @@ require('${import_node_path.default.normalize(`${thisDir}/..`)}/setup').execute(
         console.log(`Non-critical error: ${e.message}`);
       }
     } else if (ignoreIfExist) {
-      try {
-        config = import_fs_extra.default.readJSONSync(configFileName);
-        if (!Object.prototype.hasOwnProperty.call(config, "dataDir")) {
-          config.dataDir = import_js_controller_common.tools.getDefaultDataDir();
-          import_fs_extra.default.writeJSONSync(configFileName, config, { spaces: 2 });
-        }
-      } catch (e) {
-        console.warn(`Cannot check config file: ${e.message}`);
-      }
-      this.setupObjects(() => callback && callback(), true);
+      this.setupObjects(() => callback?.(), true);
       return;
     }
-    this.setupObjects(() => callback && callback(isCreated));
+    this.setupObjects(() => callback?.(isCreated));
   }
 }
 // Annotate the CommonJS export names for ESM import in node: