@iobroker/js-controller-cli 7.0.8-alpha.8-20251127-036be0224 → 7.1.0

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

@@ -1,15 +1,24 @@
 import fs from 'fs-extra';
 import path from 'node:path';
 import readline from 'node:readline';
+import readlineSync from 'readline-sync';
+import prompt from 'prompt';
 import { tools } from '@iobroker/js-controller-common';
 import { isLocalObjectsDbServer, isLocalStatesDbServer } from '@iobroker/js-controller-common';
 import { MHClient } from './multihostClient.js';
-import readlineSync from 'readline-sync';
-import prompt from 'prompt';
+/**
+ *  Multihost CLI class
+ *  Handles multihost related commands
+ */
 export class Multihost {
     configName;
     params;
     objects;
+    /**
+     * Constructor
+     *
+     * @param options options for the Multihost CLI
+     */
     constructor(options) {
         this.configName = tools.getConfigFileName();
         this.params = options.params || {};
@@ -55,8 +64,7 @@ export class Multihost {
     async browse() {
         const mhClient = new MHClient();
         try {
-            const res = await mhClient.browse(2_000, !!this.params.debug);
-            return res;
+            return await mhClient.browse(2_000, !!this.params.debug);
         }
         catch (e) {
             throw new Error(`Multihost discovery client: Cannot browse: ${e.message}`);
@@ -111,8 +119,8 @@ export class Multihost {
         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
@@ -128,7 +136,7 @@ export class Multihost {
             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');
@@ -172,13 +180,13 @@ export class Multihost {
                     },
                 };
                 prompt.start();
-                prompt.get(schema, (err, password) => {
+                prompt.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', (err, obj) => {
+                            this.objects.getObject('system.config', (_err, obj) => {
                                 config.multihostService.password = tools.encrypt(obj.native.secret, password.password);
                                 this.showMHState(config, changed);
                                 callback();
@@ -217,10 +225,10 @@ export class Multihost {
     /**
      * 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) => {
@@ -236,19 +244,34 @@ export class Multihost {
                 if (hasLocalObjectsServer || hasLocalStatesServer) {
                     callback(new Error(`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.`));
                 }
-                else {
-                    if (tools.isListenAllAddress(config.states.host)) {
-                        // TODO: why we set the remote IP only when the local config allows full connectivity?
+                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 server delivers 0.0.0.0 or ::, set to actual IP of the host
+                    if (tools.isListenAllAddress(sHost)) {
                         config.states.host = ipHost ?? '';
                     }
-                    if (tools.isListenAllAddress(config.objects.host)) {
-                        // TODO: why we set the remote IP only when the local config allows full connectivity?
+                    const oHost = Array.isArray(config.objects.host) ? config.objects.host[0] : config.objects.host;
+                    // If server delivers 0.0.0.0 or ::, set to actual IP of the host
+                    if (tools.isListenAllAddress(oHost)) {
                         config.objects.host = ipHost ?? '';
                     }
                     fs.writeFileSync(this.configName, JSON.stringify(config, null, 2));
                     console.log('Config ok. Please restart ioBroker: "iobroker restart"');
                     callback();
                 }
+                else {
+                    // Find if any of the hosts is "listen all" or reachable
+                    if (Array.isArray(config.states.host)) {
+                        config.states.host = config.states.host.map((sHost) => tools.isListenAllAddress(sHost) ? (ipHost ?? '') : sHost);
+                    }
+                    if (Array.isArray(config.objects.host)) {
+                        config.objects.host = config.objects.host.map((oHost) => tools.isListenAllAddress(oHost) ? (ipHost ?? '') : oHost);
+                    }
+                    fs.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!'));
@@ -260,7 +283,7 @@ export class Multihost {
      *
      * @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/esm/lib/setup/setupMultihost.js.map

@@ -1 +1 @@
-{"version":3,"file":"setupMultihost.js","sourceRoot":"","sources":["../../../../src/lib/setup/setupMultihost.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"setupMultihost.js","sourceRoot":"","sources":["../../../../src/lib/setup/setupMultihost.ts"],"names":[],"mappings":"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"}

package/build/esm/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/esm/lib/setup/setupSetup.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"setupSetup.d.ts","sourceRoot":"","sources":["../../../../src/lib/setup/setupSetup.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,KAAK,EAAE,oBAAoB,EAAE,SAAS,EAAE,mBAAmB,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AAM/G,OAAO,EAAE,UAAU,EAAS,MAAM,gCAAgC,CAAC;AAiCnE,MAAM,WAAW,eAAe;IAC5B,aAAa,EAAE,oBAAoB,CAAC;IACpC,WAAW,EAAE,mBAAmB,CAAC;IACjC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC5B,iBAAiB,EAAE,iBAAiB,CAAC;CACxC;AAED,MAAM,WAAW,mBAAmB;IAChC,gCAAgC;IAChC,QAAQ,EAAE,CAAC,SAAS,CAAC,EAAE,OAAO,KAAK,IAAI,CAAC;IACxC,0FAA0F;IAC1F,aAAa,EAAE,OAAO,CAAC;IACvB,+BAA+B;IAC/B,QAAQ,EAAE,OAAO,CAAC;CACrB;AAED,qBAAa,KAAK;IACd,iGAAiG;IACjG,OAAO,CAAC,QAAQ,CAAC,wBAAwB,CAAyB;IAClE,2DAA2D;IAC3D,OAAO,CAAC,QAAQ,CAAC,8BAA8B,CAAY;IAC3D,uCAAuC;IACvC,OAAO,CAAC,QAAQ,CAAC,qBAAqB,CAAc;IACpD,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAsB;IAClD,OAAO,CAAC,MAAM,CAAgC;IAC9C,OAAO,CAAC,OAAO,CAAiC;IAChD,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAsB;IAC7C,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAuB;IACrD,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAoB;gBAE1C,OAAO,EAAE,eAAe;IAS9B,kBAAkB,CAAC,YAAY,CAAC,EAAE,QAAQ,CAAC,kBAAkB,GAAG,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;IAiF1F;;;;;OAKG;IACG,UAAU,CACZ,YAAY,EAAE,QAAQ,CAAC,kBAAkB,GAAG,SAAS,GAAG,IAAI,EAC5D,QAAQ,EAAE,MAAM,IAAI,GACrB,OAAO,CAAC,IAAI,CAAC;IAkFV,OAAO,CAAC,KAAK,EAAE,SAAS,EAAE,cAAc,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;IA8C7F;;;;OAIG;YACW,SAAS;IAqCvB;;;;;OAKG;IACG,YAAY,CAAC,QAAQ,EAAE,MAAM,IAAI,EAAE,oBAAoB,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IA8EvF;;;;;OAKG;IACG,cAAc,CAAC,SAAS,EAAE,QAAQ,CAAC,YAAY,EAAE,SAAS,EAAE,QAAQ,CAAC,YAAY,GAAG,OAAO,CAAC,UAAU,CAAC;IAyPvG,WAAW,IAAI,OAAO,CAAC,UAAU,CAAC;IAyXxC;;OAEG;YACW,iBAAiB;IAoB/B;;OAEG;YACW,iBAAiB;IAgB/B;;OAEG;YACW,yBAAyB;IAyBvC;;OAEG;YACW,4BAA4B;IAyE1C;;OAEG;IACG,uBAAuB,IAAI,OAAO,CAAC,IAAI,CAAC;IAW9C;;OAEG;YACW,oBAAoB;IAqClC;;OAEG;YACW,wBAAwB;IA2CtC;;OAEG;YACW,oBAAoB;IAgClC;;OAEG;YACW,sBAAsB;IAepC;;OAEG;YACW,oBAAoB;IA0ClC;;OAEG;YACW,+BAA+B;IAuC7C;;;;OAIG;IACH,KAAK,CAAC,OAAO,EAAE,mBAAmB,GAAG,IAAI;CAwK5C"}
+{"version":3,"file":"setupSetup.d.ts","sourceRoot":"","sources":["../../../../src/lib/setup/setupSetup.ts"],"names":[],"mappings":"AAWA,OAAO,KAAK,EAAE,oBAAoB,EAAE,SAAS,EAAE,mBAAmB,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AAI/G,OAAO,EAAE,UAAU,EAAS,MAAM,gCAAgC,CAAC;AAiCnE,MAAM,WAAW,eAAe;IAC5B,aAAa,EAAE,oBAAoB,CAAC;IACpC,WAAW,EAAE,mBAAmB,CAAC;IACjC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC5B,iBAAiB,EAAE,iBAAiB,CAAC;CACxC;AAED,MAAM,WAAW,mBAAmB;IAChC,gCAAgC;IAChC,QAAQ,EAAE,CAAC,SAAS,CAAC,EAAE,OAAO,KAAK,IAAI,CAAC;IACxC,0FAA0F;IAC1F,aAAa,EAAE,OAAO,CAAC;IACvB,+BAA+B;IAC/B,QAAQ,EAAE,OAAO,CAAC;CACrB;AAED,qBAAa,KAAK;IACd,iGAAiG;IACjG,OAAO,CAAC,QAAQ,CAAC,wBAAwB,CAAyB;IAClE,2DAA2D;IAC3D,OAAO,CAAC,QAAQ,CAAC,8BAA8B,CAAY;IAC3D,uCAAuC;IACvC,OAAO,CAAC,QAAQ,CAAC,qBAAqB,CAAc;IACpD,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAsB;IAClD,OAAO,CAAC,MAAM,CAAgC;IAC9C,OAAO,CAAC,OAAO,CAAiC;IAChD,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAsB;IAC7C,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAuB;IACrD,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAoB;gBAE1C,OAAO,EAAE,eAAe;IAS9B,kBAAkB,CAAC,YAAY,CAAC,EAAE,QAAQ,CAAC,kBAAkB,GAAG,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;IAiF1F;;;;;OAKG;IACG,UAAU,CACZ,YAAY,EAAE,QAAQ,CAAC,kBAAkB,GAAG,SAAS,GAAG,IAAI,EAC5D,QAAQ,EAAE,MAAM,IAAI,GACrB,OAAO,CAAC,IAAI,CAAC;IAkFV,OAAO,CAAC,KAAK,EAAE,SAAS,EAAE,cAAc,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;IA8C7F;;;;OAIG;YACW,SAAS;IAqCvB;;;;;OAKG;IACG,YAAY,CAAC,QAAQ,EAAE,MAAM,IAAI,EAAE,oBAAoB,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IA8EvF;;;;;OAKG;IACG,cAAc,CAAC,SAAS,EAAE,QAAQ,CAAC,YAAY,EAAE,SAAS,EAAE,QAAQ,CAAC,YAAY,GAAG,OAAO,CAAC,UAAU,CAAC;IAyPvG,WAAW,IAAI,OAAO,CAAC,UAAU,CAAC;IA+XxC;;OAEG;YACW,iBAAiB;IAoB/B;;OAEG;YACW,iBAAiB;IAgB/B;;OAEG;YACW,iCAAiC;IAyB/C;;OAEG;YACW,4BAA4B;IAyE1C;;OAEG;IACG,uBAAuB,IAAI,OAAO,CAAC,IAAI,CAAC;IAW9C;;OAEG;YACW,oBAAoB;IAqClC;;OAEG;YACW,wBAAwB;IA2CtC;;OAEG;YACW,oBAAoB;IAgClC;;OAEG;YACW,sBAAsB;IAepC;;OAEG;YACW,oBAAoB;IA0ClC;;OAEG;YACW,+BAA+B;IAuC7C;;;;OAIG;IACH,KAAK,CAAC,OAAO,EAAE,mBAAmB,GAAG,IAAI;CA4J5C"}

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

@@ -35,7 +35,7 @@ export 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;
@@ -154,7 +154,7 @@ export 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}`);
@@ -266,7 +266,7 @@ Please DO NOT copy files manually into ioBroker storage directories!`);
         }
         if (!configObj.native?.secret) {
             const buf = crypto.randomBytes(24);
-            configObj.native = configObj.native || {};
+            configObj.native ||= {};
             configObj.native.secret = buf.toString('hex');
             configObj.from = `system.host.${tools.getHostName()}.cli`;
             configObj.ts = Date.now();
@@ -299,14 +299,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');
                 }
@@ -563,12 +563,10 @@ Please DO NOT copy files manually into ioBroker storage directories!`);
     }
     async setupCustom() {
         let config;
-        let originalConfig;
         // read actual configuration
         try {
             if (fs.existsSync(tools.getConfigFileName())) {
                 config = fs.readJsonSync(tools.getConfigFileName());
-                originalConfig = deepClone(config);
             }
             else {
                 config = fs.readJsonSync(path.join(CONTROLLER_DIR, 'conf', `${tools.appName.toLowerCase()}-dist.json`));
@@ -577,13 +575,14 @@ Please DO NOT copy files manually into ioBroker storage directories!`);
         catch {
             config = fs.readJsonSync(path.join(CONTROLLER_DIR, 'conf', `${tools.appName.toLowerCase()}-dist.json`));
         }
+        const originalConfig = deepClone(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
@@ -591,8 +590,8 @@ Please DO NOT copy files manually into ioBroker storage directories!`);
         }
         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}`);
         }
@@ -601,40 +600,40 @@ Please DO NOT copy files manually into ioBroker storage directories!`);
         if (hasObjectsServer || hasStatesServer) {
             console.log(`- Data Directory: ${tools.getDefaultDataDir()}`);
         }
-        if (originalConfig && originalConfig.system && originalConfig.system.hostname) {
+        if (originalConfig?.system?.hostname) {
             console.log(`- Host name: ${originalConfig.system.hostname}`);
         }
         console.log('');
-        let otype = rl.question(`Type of objects DB [(j)sonl, (f)ile, (r)edis, ...], default [${currentObjectsType}]: `, {
+        let oType = rl.question(`Type of objects DB [(j)sonl, (f)ile, (r)edis, ...], default [${currentObjectsType}]: `, {
             defaultInput: currentObjectsType,
         });
-        otype = otype.toLowerCase();
-        if (otype === 'r') {
-            otype = 'redis';
+        oType = oType.toLowerCase();
+        if (oType === 'r') {
+            oType = 'redis';
         }
-        else if (otype === 'f') {
-            otype = 'file';
+        else if (oType === 'f') {
+            oType = 'file';
         }
-        else if (otype === 'j') {
-            otype = 'jsonl';
+        else if (oType === 'j') {
+            oType = 'jsonl';
         }
         let getDefaultObjectsPort;
         try {
-            const path = require.resolve(`@iobroker/db-objects-${otype}`);
+            const path = require.resolve(`@iobroker/db-objects-${oType}`);
             getDefaultObjectsPort = require(path).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 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!');
@@ -642,20 +641,20 @@ 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 : tools.getLocalAddress();
-        let oHost = rl.question(`Host / Unix Socket of objects DB(${otype}), default[${Array.isArray(defaultObjectsHost) ? defaultObjectsHost.join(',') : defaultObjectsHost}]: `, {
+        const defaultObjectsHost = oType === originalConfig.objects.type ? originalConfig.objects.host : tools.getLocalAddress();
+        let oHost = rl.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
+        const defaultObjectsPort = oType === originalConfig.objects.type && oHost === originalConfig.objects.host
             ? originalConfig.objects.port
             : op;
-        const userObjPort = rl.question(`Port of objects DB(${otype}), default[${Array.isArray(defaultObjectsPort) ? defaultObjectsPort.join(',') : defaultObjectsPort}]: `, {
+        const userObjPort = rl.question(`Port of objects DB(${oType}), default[${Array.isArray(defaultObjectsPort) ? defaultObjectsPort.join(',') : defaultObjectsPort}]: `, {
             defaultInput: Array.isArray(defaultObjectsPort) ? defaultObjectsPort.join(',') : defaultObjectsPort,
             limit: /^[0-9, ]+$/,
         });
@@ -684,7 +683,7 @@ Please DO NOT copy files manually into ioBroker storage directories!`);
                 return EXIT_CODES.INVALID_ARGUMENTS;
             }
         }
-        config.objects = await performObjectsInterview({ dbType: otype, config: config.objects });
+        config.objects = await performObjectsInterview({ dbType: oType, config: config.objects });
         let oSentinelName = null;
         if (oSentinel) {
             const defaultSentinelName = originalConfig.objects.sentinelName
@@ -696,68 +695,68 @@ Please DO NOT copy files manually into ioBroker storage directories!`);
         }
         let defaultStatesType = currentStatesType;
         try {
-            require.resolve(`@iobroker/db-states-${otype}`);
-            defaultStatesType = otype; // if states db is also available with same type we use as default
+            require.resolve(`@iobroker/db-states-${oType}`);
+            defaultStatesType = oType; // if states db is also available with same type we use as default
         }
         catch {
             // ignore, unchanged
         }
-        let stype = rl.question(`Type of states DB [(j)sonl, (f)file, (r)edis, ...], default [${defaultStatesType}]: `, {
+        let sType = rl.question(`Type of states DB [(j)sonl, (f)file, (r)edis, ...], default [${defaultStatesType}]: `, {
             defaultInput: defaultStatesType,
         });
-        stype = stype.toLowerCase();
-        if (stype === 'r') {
-            stype = 'redis';
+        sType = sType.toLowerCase();
+        if (sType === 'r') {
+            sType = 'redis';
         }
-        else if (stype === 'f') {
-            stype = 'file';
+        else if (sType === 'f') {
+            sType = 'file';
         }
-        else if (stype === 'j') {
-            stype = 'jsonl';
+        else if (sType === 'j') {
+            sType = 'jsonl';
         }
         let getDefaultStatesPort;
         try {
-            const path = require.resolve(`@iobroker/db-states-${stype}`);
+            const path = require.resolve(`@iobroker/db-states-${sType}`);
             getDefaultStatesPort = require(path).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 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 || tools.getLocalAddress();
-        if (stype === otype) {
+        let defaultStatesHost = sType === originalConfig.states.type ? originalConfig.states.host : oHost || tools.getLocalAddress();
+        if (sType === oType) {
             defaultStatesHost = oHost;
         }
-        let sHost = rl.question(`Host / Unix Socket of states DB (${stype}), default[${Array.isArray(defaultStatesHost) ? defaultStatesHost.join(',') : defaultStatesHost}]: `, {
+        let sHost = rl.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
+        let defaultStatesPort = sType === originalConfig.states.type && sHost === originalConfig.states.host
             ? originalConfig.states.port
             : sp;
-        const statesHasServer = await statesDbHasServer(stype);
-        if (stype === otype && !statesHasServer && sHost === oHost) {
+        const statesHasServer = await statesDbHasServer(sType);
+        if (sType === oType && !statesHasServer && sHost === oHost) {
             defaultStatesPort = oPort;
         }
-        const userStatePort = rl.question(`Port of states DB (${stype}), default[${Array.isArray(defaultStatesPort) ? defaultStatesPort.join(',') : defaultStatesPort}]: `, {
+        const userStatePort = rl.question(`Port of states DB (${sType}), default[${Array.isArray(defaultStatesPort) ? defaultStatesPort.join(',') : defaultStatesPort}]: `, {
             defaultInput: Array.isArray(defaultStatesPort) ? defaultStatesPort.join(',') : defaultStatesPort,
             limit: /^[0-9, ]+$/,
         });
@@ -787,7 +786,7 @@ Please DO NOT copy files manually into ioBroker storage directories!`);
                 return EXIT_CODES.INVALID_ARGUMENTS;
             }
         }
-        config.states = await performStatesInterview({ dbType: stype, config: config.states });
+        config.states = await performStatesInterview({ dbType: sType, config: config.states });
         let sSentinelName = null;
         if (sSentinel) {
             const defaultSentinelName = originalConfig.states.sentinelName
@@ -801,8 +800,8 @@ Please DO NOT copy files manually into ioBroker storage directories!`);
         }
         let dir;
         let hname;
-        const hasLocalObjectsServer = await isLocalObjectsDbServer(otype, oHost);
-        const hasLocalStatesServer = await isLocalStatesDbServer(stype, sHost);
+        const hasLocalObjectsServer = await isLocalObjectsDbServer(oType, oHost);
+        const hasLocalStatesServer = await isLocalStatesDbServer(sType, sHost);
         if (hasLocalStatesServer || hasLocalObjectsServer) {
             let validDataDir = false;
             while (!validDataDir) {
@@ -831,13 +830,13 @@ Please DO NOT copy files manually into ioBroker storage directories!`);
             console.log(`${COLOR_RED}Invalid host name: ${hname}${COLOR_RESET}`);
             return 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 = undefined;
         config.objects.dataDir = undefined;
@@ -859,8 +858,7 @@ Please DO NOT copy files manually into ioBroker storage directories!`);
             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
@@ -870,7 +868,7 @@ Please DO NOT copy files manually into ioBroker storage directories!`);
             throw new Error('Objects not set up, call setupObjects first');
         }
         try {
-            // if we have a single host system we need to ensure that existing objects are migrated to sets before doing anything else
+            // if we have a single host system, we need to ensure that existing objects are migrated to sets before doing anything else
             if (await tools.isSingleHost(this.objects)) {
                 await this.objects.activateSets();
                 const noMigrated = await this.objects.migrateToSets();
@@ -899,9 +897,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 (tools.isDevInstallation()) {
             return;
         }
@@ -1182,7 +1180,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
      */
@@ -1312,22 +1310,10 @@ require('${path.normalize(`${thisDir}/..`)}/setup').execute();`;
         }
         else if (ignoreIfExist) {
             // it is a setup first run and config exists yet
-            try {
-                config = fs.readJSONSync(configFileName);
-                if (!Object.prototype.hasOwnProperty.call(config, 'dataDir')) {
-                    // Workaround: there was a bug with admin v5 which could remove the dataDir attribute -> fix this
-                    // TODO: remove it as soon as all adapters are fixed which use systemConfig.dataDir, with v5.1 we can for sure remove this
-                    config.dataDir = tools.getDefaultDataDir();
-                    fs.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));
     }
 }
 //# sourceMappingURL=setupSetup.js.map