@iobroker/js-controller-cli 4.0.0-alpha.46-20220119-9e487e55 → 4.0.0-alpha.47-20220120-7bad8e08

package/lib/cli/cliCompact.js

@@ -11,7 +11,6 @@ module.exports = class CLICompact extends CLICommand {
         super(options);
         this.config = fs.readJSONSync(tools.getConfigFileName());
     }
-
     /**
      * Executes a command
      * @param {any[]} args

package/lib/cli/cliHost.js

@@ -283,24 +283,19 @@ module.exports = class CLIHost extends CLICommand {
  * @param {any} objects The objects DB to use
  * @param {any} instance The instance object
  * @param {string} newHostname The new hostname the instance should be running on
+ * @return Promise<void>
  */
-function changeInstanceHost(objects, instance, newHostname) {
-    return new Promise(resolve => {
-        const oldInstanceHost = instance.common.host;
-        instance.from = getObjectFrom();
-        instance.ts = Date.now();
-        instance.common.host = newHostname;
-        // and save it
-        objects
-            .setObjectAsync(instance._id, instance)
-            .then(() => {
-                CLI.success.instanceHostChanged(instance._id, oldInstanceHost, newHostname);
-                resolve();
-            })
-            .catch(err => {
-                CLI.error.cannotChangeObject(instance._id, err.message);
-                // resolve anyways, we don't want to cause errors
-                resolve();
-            });
-    });
+async function changeInstanceHost(objects, instance, newHostname) {
+    const oldInstanceHost = instance.common.host;
+    instance.from = getObjectFrom();
+    instance.ts = Date.now();
+    instance.common.host = newHostname;
+    // and save it
+    try {
+        await objects.setObjectAsync(instance._id, instance);
+        CLI.success.instanceHostChanged(instance._id, oldInstanceHost, newHostname);
+    } catch (e) {
+        CLI.error.cannotChangeObject(instance._id, e.message);
+        // resolve anyways, we don't want to cause errors
+    }
 }

package/lib/cli/cliObjects.js

@@ -469,7 +469,7 @@ module.exports = class CLIObjects extends CLICommand {
                             input: process.stdin,
                             output: process.stdout
                         });
-                        rl.question(result.length + ' object(s) will be deleted. Are you sure? [y/N]: ', answer => {
+                        rl.question(`${result.length} object(s) will be deleted. Are you sure? [y/N]: `, answer => {
                             rl.close();
                             if (
                                 answer === 'y' ||
@@ -491,21 +491,19 @@ module.exports = class CLIObjects extends CLICommand {
                 });
             } else {
                 // only one object
-                objects.delObject(id, err => {
+                objects.delObject(id, async err => {
                     if (err) {
                         CLI.error.objectNotFound(id, err);
-                        return void callback(3);
+                        callback(3);
                     } else {
-                        tools
-                            .removeIdFromAllEnums(objects, id)
-                            .then(() => {
-                                CLI.success.objectDeleted(id);
-                                return void callback();
-                            })
-                            .catch(e => {
-                                CLI.error.cannotDeleteObjectFromEnums(id, e.message);
-                                return void callback(3);
-                            });
+                        try {
+                            await tools.removeIdFromAllEnums(objects, id);
+                            CLI.success.objectDeleted(id);
+                            callback();
+                        } catch (e) {
+                            CLI.error.cannotDeleteObjectFromEnums(id, e.message);
+                            callback(3);
+                        }
                     }
                 });
             }

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@iobroker/js-controller-cli",
-  "version": "4.0.0-alpha.46-20220119-9e487e55",
+  "version": "4.0.0-alpha.47-20220120-7bad8e08",
   "engines": {
     "node": ">=12.0.0"
   },
   "dependencies": {
-    "@iobroker/js-controller-common": "4.0.0-alpha.46-20220119-9e487e55",
-    "@iobroker/js-controller-common-db": "4.0.0-alpha.46-20220119-9e487e55",
+    "@iobroker/js-controller-common": "4.0.0-alpha.47-20220120-7bad8e08",
+    "@iobroker/js-controller-common-db": "4.0.0-alpha.47-20220120-7bad8e08",
     "chokidar": "^3.5.2",
     "daemonize2": "^0.4.2",
     "debug": "^4.3.3",
@@ -38,5 +38,5 @@
     "lib/",
     "index.js"
   ],
-  "gitHead": "e081e38bf6d24e767e16a0bb5a8d8202f65a9302"
+  "gitHead": "1b9bfb430be9ce5a823a9dcd91f612a216281f4f"
 }