@iobroker/js-controller-cli 4.0.0-alpha.45-20220114-88aaebdb → 4.0.0-alpha.49-20220121-e7aa4308

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/lib/cli/cliStates.js

@@ -7,7 +7,7 @@ const ALIAS_STARTS_WITH = 'alias.';
 
 /** Command iobroker state ... */
 module.exports = class CLIStates extends CLICommand {
-    /** @param {import('./cliCommand').CLICommandOptions} options */
+    /** @param {CLICommandOptions} options */
     constructor(options) {
         super(options);
     }
@@ -39,6 +39,9 @@ module.exports = class CLIStates extends CLICommand {
             case 'getvalue':
                 resultTransform = obj => (obj ? formatValue(obj.val, pretty) : 'null');
                 return this.get_(args, resultTransform);
+            case 'getBinary':
+            case 'getbinary':
+                return this._getBinary(args);
             case 'set':
                 return this.set_(args);
             case 'chmod':
@@ -102,6 +105,53 @@ module.exports = class CLIStates extends CLICommand {
         });
     }
 
+    /**
+     * Checks if state is a binary state
+     * @param {string} id id of the state
+     * @param {object} objects the objects db
+     * @param {ioBroker.OtherObject?} obj cached object
+     * @return {Promise<boolean>}
+     * @private
+     */
+    async _isBinary(id, objects, obj) {
+        obj = obj || (await objects.getObjectAsync(id));
+
+        return !!(obj && (obj.binary || (obj.common && obj.common.type === 'file')));
+    }
+
+    /**
+     * Get and show binary state
+     *
+     * @param {any[]} args
+     * @private
+     */
+    _getBinary(args) {
+        const { callback, dbConnect } = this.options;
+        const id = args[1];
+        dbConnect(async (objects, states) => {
+            try {
+                /** @type Buffer | null */
+                const state = await states.getBinaryState(id);
+
+                if (!state) {
+                    CLI.error.stateNotFound(id);
+                    return void callback(1);
+                }
+
+                if (Buffer.isBuffer(state)) {
+                    console.log(state.toString(this.options.encoding));
+                    return void callback();
+                } else {
+                    CLI.error.stateNotBinary(id);
+                    return void callback(1);
+                }
+            } catch (e) {
+                CLI.error.unknown(e);
+                return void callback(1);
+            }
+        });
+    }
+
     /**
      * Returns the value of a state
      * @param {any[]} args
@@ -111,7 +161,7 @@ module.exports = class CLIStates extends CLICommand {
         const { callback, dbConnect } = this.options;
         const id = args[1];
 
-        dbConnect((objects, states) => {
+        dbConnect(async (objects, states) => {
             if (id.startsWith(ALIAS_STARTS_WITH)) {
                 objects.getObject(id, (err, targetObj) => {
                     // alias
@@ -120,17 +170,25 @@ module.exports = class CLIStates extends CLICommand {
                             typeof targetObj.common.alias.id.read === 'string'
                                 ? targetObj.common.alias.id.read
                                 : targetObj.common.alias.id;
-                        objects.getObject(aliasId, (err, sourceObj) => {
-                            // write target
-                            states.getState(aliasId, (err, state) => {
-                                if (err || !targetObj) {
-                                    CLI.error.unknown(err);
+                        objects.getObject(aliasId, async (err, sourceObj) => {
+                            // read target
+                            try {
+                                if (await this._isBinary(aliasId, objects, targetObj)) {
+                                    CLI.error.stateBinaryGetUnsupported(aliasId);
+                                    return void callback(1);
+                                }
+
+                                const state = await states.getStateAsync(aliasId);
+                                if (!state) {
+                                    CLI.error.stateNotFound(id);
                                 } else {
                                     tools.formatAliasValue(sourceObj.common, targetObj.common, state, console, '');
                                     console.log(resultTransform(state));
                                 }
-                                return void callback();
-                            });
+                            } catch (e) {
+                                CLI.error.unknown(e);
+                            }
+                            return void callback();
                         });
                     } else {
                         CLI.error.unknown(err || `Alias ${id} has no target`);
@@ -138,14 +196,21 @@ module.exports = class CLIStates extends CLICommand {
                     }
                 });
             } else {
-                states.getState(id, (err, state) => {
-                    if (err || !state) {
-                        CLI.error.stateNotFound(id, err);
+                try {
+                    if (await this._isBinary(id, objects)) {
+                        CLI.error.stateBinaryGetUnsupported(id);
+                        return void callback(1);
+                    }
+                    const state = await states.getStateAsync(id);
+                    if (!state) {
+                        CLI.error.stateNotFound(id);
                     } else {
                         console.log(resultTransform(state));
                     }
-                    return void callback();
-                });
+                } catch (e) {
+                    CLI.error.unknown(e);
+                }
+                return void callback();
             }
         });
     }
@@ -173,7 +238,11 @@ module.exports = class CLIStates extends CLICommand {
             const newVal = ack === undefined ? { val, ack: false } : { val, ack: !!ack };
 
             if (id.startsWith(ALIAS_STARTS_WITH)) {
-                objects.getObject(id, (err, obj) => {
+                objects.getObject(id, async (err, obj) => {
+                    if (await this._isBinary(id, objects, obj)) {
+                        CLI.error.stateBinarySetUnsupported(id);
+                        return void callback(1);
+                    }
                     // alias
                     if (obj && obj.common && obj.common.alias && obj.common.alias.id) {
                         const aliasId =
@@ -227,11 +296,17 @@ module.exports = class CLIStates extends CLICommand {
                     }
                 });
             } else {
-                objects.getObject(id, (err, obj) => {
+                objects.getObject(id, async (err, obj) => {
                     if (err) {
                         CLI.error.unknown(err);
                         return void callback(1); // access error
                     }
+
+                    if (await this._isBinary(id, objects, obj)) {
+                        CLI.error.stateBinarySetUnsupported(id);
+                        return void callback(1);
+                    }
+
                     if (!obj && !force) {
                         CLI.error.objectNotFound(id, 'null');
                         return void callback(1); // object not exists

package/lib/cli/messages.js

@@ -4,6 +4,11 @@ const { tools } = require('@iobroker/js-controller-common');
 const errorMessages = Object.freeze({
     stateNotFound: (/** @type {string} */ stateID, /** @type {string?} */ error) =>
         `The state ${stateID} was not found!` + (error ? ` Reason: ${error}` : ''),
+    stateNotBinary: (/** @type {string} */ stateId) => `State "${stateId}" is not binary.`,
+    stateBinaryGetUnsupported: (/** @type {string} */ stateId) =>
+        `State "${stateId}" is a binary state, please use getBinary.`,
+    stateBinarySetUnsupported: (/** @type {string} */ stateId) =>
+        `State "${stateId}" is a binary state and cannot be set via cli.`,
     objectNotFound: (/** @type {string} */ objectID, /** @type {string?} */ error) =>
         `The object ${objectID} was not found!` + (error ? ` Reason: ${error}` : ''),
     cannotUpdateObject: (/** @type {string} */ objectID, /** @type {string?} */ error) =>

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@iobroker/js-controller-cli",
-  "version": "4.0.0-alpha.45-20220114-88aaebdb",
+  "version": "4.0.0-alpha.49-20220121-e7aa4308",
   "engines": {
     "node": ">=12.0.0"
   },
   "dependencies": {
-    "@iobroker/js-controller-common": "4.0.0-alpha.45-20220114-88aaebdb",
-    "@iobroker/js-controller-common-db": "4.0.0-alpha.45-20220114-88aaebdb",
+    "@iobroker/js-controller-common": "4.0.0-alpha.49-20220121-e7aa4308",
+    "@iobroker/js-controller-common-db": "4.0.0-alpha.49-20220121-e7aa4308",
     "chokidar": "^3.5.2",
     "daemonize2": "^0.4.2",
     "debug": "^4.3.3",
@@ -38,5 +38,5 @@
     "lib/",
     "index.js"
   ],
-  "gitHead": "e2fd3e7af91eb83c30f8ae45f71d6e178edc7b28"
+  "gitHead": "f42f117b74d3c4bfac0bc872c087d382ca897b7c"
 }