@iobroker/js-controller-cli 4.0.23 → 4.1.0-alpha.0-20220823-bd606e5c

package/{lib → build/lib}/cli/cliStates.js

@@ -1,26 +1,50 @@
-'use strict';
-const { tools } = require('@iobroker/js-controller-common');
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CLIStates = void 0;
+const js_controller_common_1 = require("@iobroker/js-controller-common");
+const cliCommand_js_1 = require("./cliCommand.js");
+// eslint-disable-next-line @typescript-eslint/no-var-requires
 const CLI = require('./messages.js');
-const CLICommand = require('./cliCommand.js');
+// eslint-disable-next-line @typescript-eslint/no-var-requires
 const { formatValue } = require('./cliTools');
+const rl = __importStar(require("readline-sync"));
 const ALIAS_STARTS_WITH = 'alias.';
-
 /** Command iobroker state ... */
-module.exports = class CLIStates extends CLICommand {
-    /** @param {CLICommandOptions} options */
+class CLIStates extends cliCommand_js_1.CLICommand {
     constructor(options) {
         super(options);
     }
-
     /**
      * Executes a command
-     * @param {any[]} args
+     * @param args
      */
     execute(args) {
         const { callback, pretty, showHelp } = this.options;
         const command = args[0];
         let resultTransform;
-
         switch (command) {
             case 'get':
                 resultTransform = obj => formatValue(obj, pretty);
@@ -31,7 +55,6 @@ module.exports = class CLIStates extends CLICommand {
                     if (!obj) {
                         return 'null';
                     }
-
                     return [obj.val, obj.ack, obj.from, obj.ts, obj.lc].map(line => formatValue(line)).join('\n');
                 };
                 return this.get_(args, resultTransform);
@@ -52,7 +75,7 @@ module.exports = class CLIStates extends CLICommand {
             case 'del':
                 return this.delete(args);
             case 'getDBVersion':
-                return this.getDBVersion(args);
+                return this.getDBVersion();
             case 'setDBVersion':
                 return this.setDBVersion();
             default:
@@ -61,7 +84,6 @@ module.exports = class CLIStates extends CLICommand {
                 return void callback(3);
         }
     }
-
     /**
      * Get the protocol version
      */
@@ -70,111 +92,97 @@ module.exports = class CLIStates extends CLICommand {
         dbConnect(async (objects, states) => {
             const version = await states.getProtocolVersion();
             console.log(`Current States DB protocol version: ${version}`);
-            return void callback();
+            return void callback(0);
         });
     }
-
     /**
      * Set protocol version
      */
     setDBVersion() {
         const { callback, dbConnect } = this.options;
         dbConnect(async (objects, states) => {
-            const rl = require('readline-sync');
-
             let answer = rl.question('Changing the protocol version will restart all hosts! Continue? [N/y]', {
                 limit: /^(yes|y|n|no)$/i,
                 defaultInput: 'no'
             });
-
             answer = answer.toLowerCase();
-
             if (answer !== 'y' && answer !== 'yes') {
                 console.log('Protocol version has not been changed!');
-                return void callback();
+                return void callback(0);
             }
-
             try {
                 await states.setProtocolVersion(this.options.version);
-            } catch (e) {
+            }
+            catch (e) {
                 console.error(`Cannot update protocol version: ${e.message}`);
                 return void callback(1);
             }
             console.log(`States DB protocol updated to version ${this.options.version}`);
-            return void callback();
+            return void callback(0);
         });
     }
-
     /**
      * Checks if state is a binary state
-     * @param {string} id id of the state
+     * @param id id of the state
      * @param {object} objects the objects db
-     * @param {ioBroker.OtherObject?} obj cached object
-     * @return {Promise<boolean>}
-     * @private
+     * @param {ioBroker.OtherObject?} _obj cached object
      */
-    async _isBinary(id, objects, obj) {
-        obj = obj || (await objects.getObjectAsync(id));
-
-        return !!(obj && (obj.binary || (obj.common && obj.common.type === 'file')));
+    async _isBinary(id, objects, _obj) {
+        const obj = _obj || (await objects.getObjectAsync(id));
+        return !!(obj && ('binary' in obj || (obj.common && 'type' in obj.common && obj.common.type === 'file')));
     }
-
     /**
      * Get and show binary state
      *
-     * @param {any[]} args
-     * @private
+     * @param args
      */
     _getBinary(args) {
         const { callback, dbConnect } = this.options;
         const id = args[1];
         dbConnect(async (objects, states) => {
             try {
-                /** @type Buffer | null */
+                // @ts-expect-error #1917
                 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 {
+                    // console.log would append new lines which will mess up the result
+                    process.stdout.write(state, this.options.encoding);
+                    return void callback(0);
+                }
+                else {
                     CLI.error.stateNotBinary(id);
                     return void callback(1);
                 }
-            } catch (e) {
+            }
+            catch (e) {
                 CLI.error.unknown(e);
                 return void callback(1);
             }
         });
     }
-
     /**
      * Returns the value of a state
-     * @param {any[]} args
-     * @param {(input: any) => any} resultTransform
+     * @param args
+     * @param resultTransform
      */
     get_(args, resultTransform) {
         const { callback, dbConnect } = this.options;
         const id = args[1];
-
         if (!id) {
             CLI.error.stateNotFound(id);
             return;
         }
-
         dbConnect(async (objects, states) => {
             if (id.startsWith(ALIAS_STARTS_WITH)) {
                 objects.getObject(id, (err, targetObj) => {
                     // alias
-                    if (targetObj && targetObj.common && targetObj.common.alias && targetObj.common.alias.id) {
-                        const aliasId =
-                            typeof targetObj.common.alias.id.read === 'string'
-                                ? targetObj.common.alias.id.read
-                                : targetObj.common.alias.id;
+                    if (targetObj && targetObj.common && 'alias' in targetObj.common && targetObj.common.alias.id) {
+                        const aliasId = typeof targetObj.common.alias.id.read === 'string'
+                            ? targetObj.common.alias.id.read
+                            : targetObj.common.alias.id;
                         objects.getObject(aliasId, async (err, sourceObj) => {
                             // read target
                             try {
@@ -182,25 +190,29 @@ module.exports = class CLIStates extends CLICommand {
                                     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, '');
+                                }
+                                else {
+                                    // @ts-expect-error fix after #1917
+                                    js_controller_common_1.tools.formatAliasValue(sourceObj === null || sourceObj === void 0 ? void 0 : sourceObj.common, targetObj.common, state, console, '');
                                     console.log(resultTransform(state));
                                 }
-                            } catch (e) {
+                            }
+                            catch (e) {
                                 CLI.error.unknown(e);
                             }
-                            return void callback();
+                            return void callback(0);
                         });
-                    } else {
+                    }
+                    else {
                         CLI.error.unknown(err || `Alias ${id} has no target`);
                         return void callback(1); // ?
                     }
                 });
-            } else {
+            }
+            else {
                 try {
                     if (await this._isBinary(id, objects)) {
                         CLI.error.stateBinaryGetUnsupported(id);
@@ -209,39 +221,36 @@ module.exports = class CLIStates extends CLICommand {
                     const state = await states.getStateAsync(id);
                     if (!state) {
                         CLI.error.stateNotFound(id);
-                    } else {
+                    }
+                    else {
                         console.log(resultTransform(state));
                     }
-                } catch (e) {
+                }
+                catch (e) {
                     CLI.error.unknown(e);
                 }
-                return void callback();
+                return void callback(0);
             }
         });
     }
-
     /**
-     * @param {any[]} args
+     * @param args
      */
     set_(args) {
         const { callback, dbConnect, showHelp } = this.options;
         // eslint-disable-next-line prefer-const
-        let [id, val, ack] = /** @type {[string, any, any]} */ (args.slice(1));
+        let [id, val, ack] = args.slice(1);
         const force = args.includes('--force') || args.includes('-f');
-
         if (val === undefined) {
             CLI.error.requiredArgumentMissing('value');
             showHelp();
-            return void callback();
+            return void callback(0);
         }
-
         if (ack !== undefined) {
             ack = ack === 'true' || ack === '1' || ack === 1 || ack === true;
         }
-
         dbConnect((objects, states) => {
             const newVal = ack === undefined ? { val, ack: false } : { val, ack: !!ack };
-
             if (id.startsWith(ALIAS_STARTS_WITH)) {
                 objects.getObject(id, async (err, obj) => {
                     if (await this._isBinary(id, objects, obj)) {
@@ -250,11 +259,9 @@ module.exports = class CLIStates extends CLICommand {
                     }
                     // alias
                     if (obj && obj.common && obj.common.alias && obj.common.alias.id) {
-                        const aliasId =
-                            typeof obj.common.alias.id.write === 'string'
-                                ? obj.common.alias.id.write
-                                : obj.common.alias.id;
-
+                        const aliasId = typeof obj.common.alias.id.write === 'string'
+                            ? obj.common.alias.id.write
+                            : obj.common.alias.id;
                         objects.getObject(aliasId, (err, targetObj) => {
                             if (err) {
                                 CLI.error.unknown(err);
@@ -264,111 +271,109 @@ module.exports = class CLIStates extends CLICommand {
                                 CLI.error.objectNotFound(id, 'null');
                                 return void callback(1); // object not exists
                             }
-
                             if (obj && obj.common && obj.common.type) {
                                 if (obj.common.type === 'string') {
                                     newVal.val = newVal.val.toString();
-                                } else if (obj.common.type === 'number') {
+                                }
+                                else if (obj.common.type === 'number') {
                                     newVal.val = parseFloat(newVal.val);
-                                } else if (obj.common.type === 'boolean') {
+                                }
+                                else if (obj.common.type === 'boolean') {
                                     newVal.val = newVal.val.toString();
                                     newVal.val =
                                         newVal.val === 'true' ||
-                                        newVal.val === '1' ||
-                                        newVal.val === 'ON' ||
-                                        newVal.val === 'on';
+                                            newVal.val === '1' ||
+                                            newVal.val === 'ON' ||
+                                            newVal.val === 'on';
                                 }
                             }
-
                             // write target
-                            states.setState(
-                                aliasId,
-                                tools.formatAliasValue(obj.common, targetObj.common, newVal, console, ''),
-                                err => {
-                                    if (err) {
-                                        CLI.error.unknown(err);
-                                        return void callback(1); // ?
-                                    } else {
-                                        CLI.success.stateUpdated(id, val, !!ack);
-                                        return void callback();
-                                    }
+                            states.setState(aliasId, 
+                            // @ts-expect-error fix after #1917
+                            js_controller_common_1.tools.formatAliasValue(obj.common, targetObj.common, newVal, console, ''), err => {
+                                if (err) {
+                                    CLI.error.unknown(err);
+                                    return void callback(1); // ?
+                                }
+                                else {
+                                    CLI.success.stateUpdated(id, val, !!ack);
+                                    return void callback(0);
                                 }
-                            );
+                            });
                         });
-                    } else {
+                    }
+                    else {
                         CLI.error.unknown(`Alias ${id} has no target`);
                         return void callback(1); // ?
                     }
                 });
-            } else {
+            }
+            else {
                 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
                     }
-
                     if (obj && obj.common && obj.common.type) {
                         if (obj.common.type === 'string') {
                             newVal.val = newVal.val.toString();
-                        } else if (obj.common.type === 'number') {
+                        }
+                        else if (obj.common.type === 'number') {
                             newVal.val = parseFloat(newVal.val);
-                        } else if (obj.common.type === 'boolean') {
+                        }
+                        else if (obj.common.type === 'boolean') {
                             newVal.val = newVal.val.toString();
                             newVal.val =
                                 newVal.val === 'true' ||
-                                newVal.val === '1' ||
-                                newVal.val === 'ON' ||
-                                newVal.val === 'on';
+                                    newVal.val === '1' ||
+                                    newVal.val === 'ON' ||
+                                    newVal.val === 'on';
                         }
                     }
-
                     states.setState(id, newVal, err => {
                         if (err) {
                             CLI.error.unknown(err);
                             return void callback(1); // ?
-                        } else {
+                        }
+                        else {
                             CLI.success.stateUpdated(id, val, !!ack);
-                            return void callback();
+                            return void callback(0);
                         }
                     });
                 });
             }
         });
     }
-
     /**
      * Deletes a state
-     * @param {any[]} args
+     * @param args
      */
     delete(args) {
         const { callback, dbConnect } = this.options;
-        /** @type {string} */
         const id = args[1];
         if (!id) {
             CLI.error.requiredArgumentMissing('id', 'state delete id');
             return void callback(1);
         }
-
-        dbConnect((objects, states) =>
-            states.delState(id, err => {
-                if (err) {
-                    CLI.error.stateNotFound(id, err);
-                    return void callback(3);
-                } else {
-                    CLI.success.stateDeleted(id);
-                    return void callback();
-                }
-            })
-        );
+        dbConnect((objects, states) => states.delState(id, err => {
+            if (err) {
+                CLI.error.stateNotFound(id, err);
+                return void callback(3);
+            }
+            else {
+                CLI.success.stateDeleted(id);
+                return void callback(0);
+            }
+        }));
     }
-};
+}
+exports.CLIStates = CLIStates;
+//# sourceMappingURL=cliStates.js.map

package/build/lib/cli/cliStates.js.map

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

package/build/lib/cli/cliTools.d.ts

@@ -0,0 +1,64 @@
+/// <reference types="iobroker" />
+import type { Client as ObjectsClient } from '@iobroker/db-objects-redis';
+/**
+ *
+ * @param val The value to format for output
+ * @param pretty Whether it should be pretty-printed
+ */
+export declare function formatValue(val: any, pretty?: boolean): string;
+/** Returns the "from" property for objects changed by the CLI */
+export declare function getObjectFrom(): `system.host.${string}.cli`;
+/**
+ * Removes <tools.appName> from the start of the adapter name if it is there
+ * E.g. iobroker.admin -> admin
+ * @param name The adapter name to normalize
+ */
+export declare function normalizeAdapterName(name: string): string;
+/**
+ * Ensures that the given string is a valid adapter identifier (<adaptername>) WITHOUT instance number
+ * @param name The name which is supposed to be an adapter identifier
+ */
+export declare function validateAdapterIdentifier(name: string): boolean;
+/**
+ * Ensures that the given string contains a valid identifier for
+ * an adapter (without instance number) or instance (with instance number)
+ * @param name
+ */
+export declare function validateAdapterOrInstanceIdentifier(name: string): boolean;
+/**
+ * Ensures that the given string contains a valid identifier for
+ * an adapter (without instance number) or instance (with instance number)
+ * @param name
+ */
+export declare function splitAdapterOrInstanceIdentifierWithVersion(name: string): {
+    name: string;
+    instance: string | null;
+    version: string | null;
+    nameWithVersion: string;
+} | null;
+/**
+ * Extracts the instance name from an object ID
+ * @param instanceObjID The ID of the instance object
+ */
+export declare function getInstanceName(instanceObjID: string): string;
+/**
+ * Enumerates the instances of an adapter or all of them
+ * @param objects The objects DB to use
+ * @param adapter (optional) The adapter whose instances should be enumerated
+ * @returns An array of instance objects
+ */
+export declare function enumInstances(objects: ObjectsClient, adapter?: string): Promise<(ioBroker.InferGetObjectViewItemType<'system', 'instance'> | null)[]>;
+/**
+ * Enumerates all known hosts
+ * @param objects The objects DB to use
+ * @returns An array of host objects
+ */
+export declare function enumHosts(objects: ObjectsClient): Promise<(ioBroker.InferGetObjectViewItemType<'system', 'host'> | null)[]>;
+/**
+ * Enumerates all objects of a given type
+ * @param objects The objects DB to use
+ * @param type The type of the objects to enumerate
+ * @param startkey The prefix of the objects
+ */
+export declare function enumObjects<T extends string>(objects: ObjectsClient, type: T, startkey: string): Promise<(ioBroker.InferGetObjectViewItemType<'system', T> | null)[]>;
+//# sourceMappingURL=cliTools.d.ts.map

package/build/lib/cli/cliTools.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"cliTools.d.ts","sourceRoot":"","sources":["../../../src/lib/cli/cliTools.ts"],"names":[],"mappings":";AACA,OAAO,KAAK,EAAE,MAAM,IAAI,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAE1E;;;;GAIG;AACH,wBAAgB,WAAW,CAAC,GAAG,EAAE,GAAG,EAAE,MAAM,UAAQ,GAAG,MAAM,CAK5D;AAED,iEAAiE;AACjE,wBAAgB,aAAa,IAAI,eAAe,MAAM,MAAM,CAE3D;AAED;;;;GAIG;AACH,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAKzD;AAED;;;GAGG;AACH,wBAAgB,yBAAyB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAE/D;AAED;;;;GAIG;AACH,wBAAgB,mCAAmC,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAEzE;AAED;;;;GAIG;AACH,wBAAgB,2CAA2C,CACvD,IAAI,EAAE,MAAM,GACb;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,eAAe,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,CAWnG;AAED;;;GAGG;AACH,wBAAgB,eAAe,CAAC,aAAa,EAAE,MAAM,GAAG,MAAM,CAE7D;AAED;;;;;GAKG;AACH,wBAAsB,aAAa,CAC/B,OAAO,EAAE,aAAa,EACtB,OAAO,CAAC,EAAE,MAAM,GACjB,OAAO,CAAC,CAAC,QAAQ,CAAC,0BAA0B,CAAC,QAAQ,EAAE,UAAU,CAAC,GAAG,IAAI,CAAC,EAAE,CAAC,CAM/E;AAED;;;;GAIG;AACH,wBAAgB,SAAS,CACrB,OAAO,EAAE,aAAa,GACvB,OAAO,CAAC,CAAC,QAAQ,CAAC,0BAA0B,CAAC,QAAQ,EAAE,MAAM,CAAC,GAAG,IAAI,CAAC,EAAE,CAAC,CAE3E;AAED;;;;;GAKG;AACH,wBAAgB,WAAW,CAAC,CAAC,SAAS,MAAM,EACxC,OAAO,EAAE,aAAa,EACtB,IAAI,EAAE,CAAC,EACP,QAAQ,EAAE,MAAM,GACjB,OAAO,CAAC,CAAC,QAAQ,CAAC,0BAA0B,CAAC,QAAQ,EAAE,CAAC,CAAC,GAAG,IAAI,CAAC,EAAE,CAAC,CAgBtE"}