@iobroker/js-controller-cli 4.0.21 → 4.1.0-alpha.0-20220819-74ceeddc

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

@@ -5,21 +5,18 @@ const { enumHosts, enumObjects, getObjectFrom, enumInstances } = require('./cliT
 const { tools } = require('@iobroker/js-controller-common');
 const os = require('os');
 const fs = require('fs-extra');
-
 /** Command iobroker host ... */
 module.exports = class CLIHost extends CLICommand {
     /** @param {import('./cliCommand').CLICommandOptions} options */
     constructor(options) {
         super(options);
     }
-
     /**
      * Executes a command
      * @param {any[]} args
      */
     execute(args) {
         const command = args[0];
-
         switch (command) {
             case 'this':
             case 'self':
@@ -32,7 +29,6 @@ module.exports = class CLIHost extends CLICommand {
                 return this.rename(args);
         }
     }
-
     /**
      * When in single-host mode, changes the hostname of the host and all instances to the current one
      * @param {any[]} _args
@@ -40,53 +36,44 @@ module.exports = class CLIHost extends CLICommand {
     self(_args) {
         this.renameHost(undefined, os.hostname());
     }
-
     /**
      * Changes the current host's hostname to the given one
      * @param {any[]} args
      */
     set(args) {
         const { callback } = this.options;
-
         /** @type {string} */
         const newHostname = args[1];
         if (!newHostname) {
             CLI.error.requiredArgumentMissing('newHostname', 'host set newHostname');
             return void callback(34);
         }
-
         this.renameHost(tools.getHostName(), newHostname);
     }
-
     /**
      * Removes the host with the given name
      * @param {any[]} args
      */
     remove(args) {
         const { callback, dbConnect } = this.options;
-
         /** @type {string} */
         const hostname = args[1];
         if (!hostname) {
             CLI.error.requiredArgumentMissing('hostname', 'host remove hostname');
             return void callback(34);
         }
-
         const newHostname = tools.getHostName();
-
         if (hostname === newHostname) {
             // avoid object deletion when target host is same host
             CLI.error.dontRemoveCurrentHost(hostname);
             return void callback(35);
         }
-
         dbConnect(async (objects, states, isOffline) => {
             try {
                 if (!isOffline) {
                     CLI.error.cannotChangeRunningSystem();
                     return void callback(30);
                 }
-
                 // Find the requested host object
                 const hosts = await enumHosts(objects);
                 const hostToDelete = hosts.find(host => host.common.hostname === hostname);
@@ -94,15 +81,14 @@ module.exports = class CLIHost extends CLICommand {
                     CLI.error.hostDoesNotExist(hostname);
                     return void callback(30);
                 }
-
                 // Delete it
                 try {
                     await objects.delObjectAsync(hostToDelete._id);
-                } catch (err) {
+                }
+                catch (err) {
                     CLI.error.cannotDeleteObject(hostToDelete._id, err.message);
                     return void callback(30);
                 }
-
                 // Also delete its states
                 const hostStates = await enumObjects(objects, 'state', `system.host.${hostname}.`);
                 for (const state of hostStates) {
@@ -110,46 +96,41 @@ module.exports = class CLIHost extends CLICommand {
                     try {
                         await objects.delObjectAsync(state._id);
                         CLI.success.stateDeleted(state._id);
-                    } catch (err) {
+                    }
+                    catch (err) {
                         CLI.error.cannotDeleteObject(state._id, err.message);
                     }
                 }
-
                 // Move all instances from the deleted host to the current one
                 const instances = await enumInstances(objects);
                 const instancesToRename = instances.filter(i => i.common.host === hostname);
                 for (const instance of instancesToRename) {
                     await changeInstanceHost(objects, instance, newHostname);
                 }
-
                 // Notify the user that we are done
                 CLI.success.hostDeleted(hostname);
                 return void callback();
-            } catch (err) {
+            }
+            catch (err) {
                 CLI.error.unknown(err.message);
                 return void callback(1);
             }
         });
     }
-
     /**
      * Renames the host with the given name to the current one (opposite of `set()`)
      * @param {any[]} args
      */
     rename(args) {
         const { callback } = this.options;
-
         /** @type {string} */
         const oldHostname = args[0];
-
         if (!oldHostname) {
             CLI.error.requiredArgumentMissing('oldHostname', 'host oldHostname');
             return void callback(34);
         }
-
         this.renameHost(oldHostname, os.hostname());
     }
-
     /**
      * Renames the host with the hostname `oldHostname` to the hostname `newHostname`
      * @param {string?} oldHostname The hostname to rename from or `undefined` to rename all hosts (single-host mode only!)
@@ -163,7 +144,6 @@ module.exports = class CLIHost extends CLICommand {
                     CLI.error.cannotChangeRunningSystem();
                     return void callback(30);
                 }
-
                 const hosts = await enumHosts(objects);
                 if (hosts.length > 1 && oldHostname === undefined) {
                     // iobroker host this/self in multihost is not allowed
@@ -171,14 +151,12 @@ module.exports = class CLIHost extends CLICommand {
                     showHelp();
                     return void callback(30);
                 }
-
                 // Does another host with the target name exist?
                 if (hosts.find(obj => obj.common.hostname === newHostname)) {
                     // TODO: This prevents migration of instances if host already exists, but we need it to prevent multiple hosts with same name
                     CLI.error.hostAlreadyExists(newHostname);
                     return void callback(30);
                 }
-
                 // Remember the new hostname in the system settings
                 const configFileName = tools.getConfigFileName();
                 const configData = fs.readJSONSync(configFileName);
@@ -186,26 +164,23 @@ module.exports = class CLIHost extends CLICommand {
                     configData.system.hostname = newHostname;
                     fs.writeFileSync(configFileName, JSON.stringify(configData, null, 2), 'utf8');
                 }
-
                 // Rename the host(s)
                 for (const host of hosts) {
                     // Remember the current hostname of this object because we need it later
                     const prevHostname = host.common.hostname;
-
                     // Rename only the hostname we're supposed to rename!
                     if (oldHostname && prevHostname !== oldHostname) {
                         continue;
                     }
-
                     // Rename the host object
                     // Therefore delete the old one because we will recreate it under a new name
                     try {
                         await objects.delObjectAsync(host._id);
-                    } catch (err) {
+                    }
+                    catch (err) {
                         CLI.error.cannotDeleteObject(host._id, err.message);
                         continue;
                     }
-
                     // Now update the object
                     Object.assign(host, {
                         _id: `system.host.${newHostname}`,
@@ -222,11 +197,11 @@ module.exports = class CLIHost extends CLICommand {
                     // And save it
                     try {
                         await objects.setObjectAsync(host._id, host);
-                    } catch (err) {
+                    }
+                    catch (err) {
                         CLI.error.cannotChangeObject(host._id, err.message);
                         continue;
                     }
-
                     // Rename its states
                     const hostStateObjects = await enumObjects(objects, 'state', `system.host.${prevHostname}.`);
                     const hostFolders = await enumObjects(objects, 'folder', `system.host.${prevHostname}.`);
@@ -234,50 +209,48 @@ module.exports = class CLIHost extends CLICommand {
                         // Therefore delete the old one because we will recreate it under a new name
                         try {
                             await objects.delObjectAsync(object._id);
-                        } catch (err) {
+                        }
+                        catch (err) {
                             CLI.error.cannotDeleteObject(object._id, err.message);
                             continue;
                         }
-
                         // Now update the object
                         Object.assign(object, {
                             _id: object._id.replace(`system.host.${prevHostname}`, `system.host.${newHostname}`),
                             from: getObjectFrom(),
                             ts: Date.now()
                         });
-
                         // And save it
                         try {
                             await objects.setObjectAsync(object._id, object);
-                        } catch (err) {
+                        }
+                        catch (err) {
                             CLI.error.cannotChangeObject(object._id, err.message);
                         }
                     }
-
                     CLI.success.hostRenamed(prevHostname, newHostname);
                 }
-
                 // Also rename all instances
                 const instances = await enumInstances(objects);
-                const instancesToRename =
-                    oldHostname === undefined ? instances : instances.filter(i => i.common.host === oldHostname);
+                const instancesToRename = oldHostname === undefined ? instances : instances.filter(i => i.common.host === oldHostname);
                 if (instancesToRename.length > 0) {
                     for (const instance of instancesToRename) {
                         // Update each instance object
                         await changeInstanceHost(objects, instance, newHostname);
                     }
-                } else {
+                }
+                else {
                     CLI.warn.noInstancesFoundOnHost(oldHostname);
                 }
                 return void callback();
-            } catch (err) {
+            }
+            catch (err) {
                 CLI.error.unknown(err.message);
                 return void callback(1);
             }
         });
     }
 };
-
 /**
  * Changes the host an instance is running on
  * @param {any} objects The objects DB to use
@@ -294,8 +267,10 @@ async function changeInstanceHost(objects, instance, newHostname) {
     try {
         await objects.setObjectAsync(instance._id, instance);
         CLI.success.instanceHostChanged(instance._id, oldInstanceHost, newHostname);
-    } catch (e) {
+    }
+    catch (e) {
         CLI.error.cannotChangeObject(instance._id, e.message);
         // resolve anyways, we don't want to cause errors
     }
 }
+//# sourceMappingURL=cliHost.js.map

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

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

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

@@ -0,0 +1,58 @@
+export = CLILogs;
+declare class CLILogs extends CLICommand {
+    /** @param {CLICommandOptions} options */
+    constructor(options: CLICommandOptions);
+    /** @type {Map<string, number>} */
+    fileSizes: Map<string, number>;
+    isReady: boolean;
+    /**
+     * Executes a command
+     * @param {any[]} args
+     */
+    execute(args: any[], params: any): void;
+    /**
+     * @typedef CLILogsOptions
+     * @property {boolean} [complete] Whether to show today's full log
+     * @property {RegExp} [regex] An optional RegExp to filter by
+     */
+    /**
+     * Called by chokidar when watched files change
+     * @param {CLILogsOptions} options some options
+     * @param {string} event The type of change
+     * @param {*} path Which path has changed
+     * @param {*} stats Information about the file
+     */
+    watchHandler(options: {
+        /**
+         * Whether to show today's full log
+         */
+        complete?: boolean | undefined;
+        /**
+         * An optional RegExp to filter by
+         */
+        regex?: RegExp | undefined;
+    }, event: string, path: any, stats: any): void;
+    /**
+     * If the log file belongs to today
+     * @param {string} path The log file path
+     */
+    isTodaysLogfile(path: string): boolean;
+    /**
+     * Streams a portion of a file to the console
+     * @param {string} path The file to stream
+     * @param {number} start The offset in bytes where to start
+     * @param {CLILogsOptions} options some options
+     */
+    streamChange(path: string, start: number, options: {
+        /**
+         * Whether to show today's full log
+         */
+        complete?: boolean | undefined;
+        /**
+         * An optional RegExp to filter by
+         */
+        regex?: RegExp | undefined;
+    }): void;
+}
+import CLICommand = require("./cliCommand.js");
+//# sourceMappingURL=cliLogs.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"cliLogs.d.ts","sourceRoot":"","sources":["../../../src/lib/cli/cliLogs.js"],"names":[],"mappings":";AAWiB;IACb,yCAAyC;IACzC,wCAKC;IAHG,kCAAkC;IAClC,WADW,IAAI,MAAM,EAAE,MAAM,CAAC,CACJ;IAC1B,iBAAoB;IAGxB;;;OAGG;IACH,cAFW,GAAG,EAAE,qBA8Cf;IAED;;;;OAIG;IAEH;;;;;;OAMG;IACH;;;;;;;;;cAJW,MAAM,+BAmBhB;IAED;;;OAGG;IACH,sBAFW,MAAM,WAKhB;IAED;;;;;OAKG;IACH,mBAJW,MAAM,SACN,MAAM;;;;;;;;;aAqBhB;CACJ"}

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

@@ -7,17 +7,15 @@ const fs = require('fs-extra');
 const os = require('os');
 const es = require('event-stream');
 const { tools } = require('@iobroker/js-controller-common');
-
 /** Command ioBroker state ... */
 module.exports = class CLILogs extends CLICommand {
-    /** @param {import('./cliCommand').CLICommandOptions} options */
+    /** @param {CLICommandOptions} options */
     constructor(options) {
         super(options);
         /** @type {Map<string, number>} */
         this.fileSizes = new Map();
         this.isReady = false;
     }
-
     /**
      * Executes a command
      * @param {any[]} args
@@ -29,10 +27,8 @@ module.exports = class CLILogs extends CLICommand {
         const count = params.lines || 1000;
         /** @type {CLILogsOptions} */
         const options = {
-            complete: this.options['all'],
-            adapterName
+            complete: this.options['all']
         };
-
         const config = fs.readJSONSync(require.resolve(getConfigFileName()));
         const logger = require('@iobroker/js-controller-common').logger(config.log);
         let fileName = logger.getFileName();
@@ -45,7 +41,8 @@ module.exports = class CLILogs extends CLICommand {
             let regex;
             if (adapterName) {
                 //2019-03-02 13:26:54.698  - debug: iot.0 [ALEXA] Created ALEXA device: Bad.Hauptlicht.Aktor.STATE ["turnOn","turnOff"]
-                regex = new RegExp(': ' + adapterName + '\\.');
+                regex = new RegExp(`: ${adapterName}\\.`);
+                options.regex = regex;
             }
             lines.forEach(line => {
                 if (regex && !regex.test(line)) {
@@ -53,7 +50,6 @@ module.exports = class CLILogs extends CLICommand {
                 }
                 console.log(line);
             });
-
             if (watch) {
                 fileName = fileName.replace(/\\/g, '/');
                 const parts = fileName.split('/');
@@ -63,17 +59,16 @@ module.exports = class CLILogs extends CLICommand {
                     .on('all', this.watchHandler.bind(this, options))
                     .on('ready', () => (this.isReady = true));
             }
-        } else {
+        }
+        else {
             console.log('No log file found');
         }
     }
-
     /**
      * @typedef CLILogsOptions
      * @property {boolean} [complete] Whether to show today's full log
-     * @property {string} [adapterName] An optional adapter name to filter by
+     * @property {RegExp} [regex] An optional RegExp to filter by
      */
-
     /**
      * Called by chokidar when watched files change
      * @param {CLILogsOptions} options some options
@@ -87,17 +82,18 @@ module.exports = class CLILogs extends CLICommand {
             if (stats.size > 0 && (this.isReady || (options.complete && this.isTodaysLogfile(path)))) {
                 this.streamChange(path, 0, options);
             }
-        } else if (event === 'change') {
+        }
+        else if (event === 'change') {
             const oldFileSize = this.fileSizes.get(path);
             this.fileSizes.set(path, stats.size);
             if (this.isReady && stats.size > oldFileSize) {
                 this.streamChange(path, oldFileSize, options);
             }
-        } else if (event === 'unlink') {
+        }
+        else if (event === 'unlink') {
             this.fileSizes.delete(path);
         }
     }
-
     /**
      * If the log file belongs to today
      * @param {string} path The log file path
@@ -106,7 +102,6 @@ module.exports = class CLILogs extends CLICommand {
         const YYYYMMDDDate = new Date().toJSON().slice(0, 10);
         return path.includes(YYYYMMDDDate);
     }
-
     /**
      * Streams a portion of a file to the console
      * @param {string} path The file to stream
@@ -119,17 +114,19 @@ module.exports = class CLILogs extends CLICommand {
             start,
             autoClose: true
         });
-        if (options.adapterName) {
+        if (options.regex) {
             // Read the input line by line and only include the lines matching the filter
             input
                 .pipe(es.split())
                 // @ts-ignore
-                .pipe(es.filterSync(line => line.includes(options.adapterName)))
+                .pipe(es.filterSync(line => options.regex.test(line)))
                 .pipe(es.mapSync(line => line + os.EOL))
                 .pipe(process.stdout);
-        } else {
+        }
+        else {
             // just pipe the input through
             tools.pipeLinewise(input, process.stdout);
         }
     }
 };
+//# sourceMappingURL=cliLogs.js.map

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

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

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

@@ -0,0 +1,10 @@
+export = CLIMessage;
+declare class CLIMessage extends CLICommand {
+    /**
+     * Executes a command
+     * @param {any[]} args
+     */
+    execute(args: any[]): undefined;
+}
+import CLICommand = require("./cliCommand.js");
+//# sourceMappingURL=cliMessage.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"cliMessage.d.ts","sourceRoot":"","sources":["../../../src/lib/cli/cliMessage.js"],"names":[],"mappings":";AAOiB;IAMb;;;OAGG;IACH,cAFW,GAAG,EAAE,aAyDf;CACJ"}

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

@@ -3,14 +3,12 @@ const CLI = require('./messages.js');
 const CLICommand = require('./cliCommand.js');
 // const tools = require('../tools.js');
 const { enumInstances } = require('./cliTools');
-
 /** Command iobroker object ... */
 module.exports = class CLIMessage extends CLICommand {
     /** @param {import('./cliCommand').CLICommandOptions} options */
     constructor(options) {
         super(options);
     }
-
     /**
      * Executes a command
      * @param {any[]} args
@@ -38,7 +36,6 @@ module.exports = class CLIMessage extends CLICommand {
         if (typeof message === 'string' && message.startsWith('{') && message.endsWith('}')) {
             message = JSON.parse(message);
         }
-
         dbConnect(async (objects, states) => {
             try {
                 const pos = adapter.indexOf('.');
@@ -57,22 +54,22 @@ module.exports = class CLIMessage extends CLICommand {
                         return void callback(1);
                     }
                     messageTargets = adapterInstances.map(row => row._id);
-                } else {
+                }
+                else {
                     messageTargets.unshift(`system.adapter.${adapter}.${instance}`);
                 }
-
                 // Send the message to all targets
                 const messagePromises = messageTargets.map(t => sendMessage(states, t, command, message));
                 await Promise.all(messagePromises);
                 return void callback();
-            } catch (err) {
+            }
+            catch (err) {
                 CLI.error.unknown(err.message);
                 return void callback(1);
             }
         });
     }
 };
-
 /**
  * @param {any} states The States DB
  * @param {string} targetId The instance or adapter to send the message to
@@ -88,3 +85,4 @@ function sendMessage(states, targetId, command, message) {
         });
     });
 }
+//# sourceMappingURL=cliMessage.js.map

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

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