@iobroker/js-controller-cli 4.0.0-alpha.42-20220108-6954bae6 → 4.0.0-alpha.46-20220119-9e487e55

package/lib/cli/cliDebug.js

@@ -2,7 +2,7 @@
 const CLI = require('./messages.js');
 const CLICommand = require('./cliCommand.js');
 const CLITools = require('./cliTools');
-const { tools } = require('@iobroker/js-controller-common');
+const { tools, EXIT_CODES } = require('@iobroker/js-controller-common');
 const child_process = require('child_process');
 
 /** Command ioBroker debug ... */
@@ -12,6 +12,32 @@ module.exports = class CLICompact extends CLICommand {
         super(options);
     }
 
+    /**
+     * Cehcks if the adpter instance is running
+     *
+     * @param {string} adapter
+     * @param {string} instance
+     * @return {Promise<boolean>}
+     * @private
+     */
+    _isInstanceRunning(adapter, instance) {
+        const { dbConnect } = this.options;
+        return new Promise(resolve => {
+            dbConnect(async (objects, states) => {
+                try {
+                    const state = await states.getStateAsync(`system.adapter.${adapter}.${instance}.alive`);
+                    if (state && state.val) {
+                        resolve(true);
+                        return;
+                    }
+                } catch {
+                    // ignore
+                }
+                resolve(false);
+            });
+        });
+    }
+
     /**
      * Executes a command
      * @param {any[]} args
@@ -24,7 +50,12 @@ module.exports = class CLICompact extends CLICommand {
             return void callback(34);
         }
 
-        const { instance } = CLITools.splitAdapterOrInstanceIdentifierWithVersion(adapter);
+        const { name, instance } = CLITools.splitAdapterOrInstanceIdentifierWithVersion(adapter);
+
+        if (await this._isInstanceRunning(name, instance || '0')) {
+            CLI.error.instanceAlreadyRunning(`${name}.${instance || '0'}`);
+            return void callback(EXIT_CODES.ADAPTER_ALREADY_RUNNING);
+        }
 
         const adapterDir = tools.getAdapterDir(adapter);
         if (!adapterDir) {

package/lib/cli/cliTools.js

@@ -51,6 +51,7 @@ function validateAdapterOrInstanceIdentifier(name) {
  * Ensures that the given string contains a valid identifier for
  * an adapter (without instance number) or instance (with instance number)
  * @param {string} name
+ * @return {{name: string, instance:string|null, version: string|null, nameWithVersion:string}|null}
  */
 function splitAdapterOrInstanceIdentifierWithVersion(name) {
     const res = name.match(/^([a-z0-9\-_]+)\.?(\d+)?@?([a-z0-9\-_.]*)?$/);

package/lib/cli/messages.js

@@ -53,7 +53,8 @@ const errorMessages = Object.freeze({
     pluginNotDefined: (pluginName, host, instance) =>
         `The plugin "${pluginName}" does not exist for ${host ? `host "${host}"` : `instance "${instance}"`}!`,
 
-    cert: certName => `Certificate "${certName}" not found or error parsing certificate information.`
+    cert: certName => `Certificate "${certName}" not found or error parsing certificate information.`,
+    instanceAlreadyRunning: instance => `The instance "${instance}" is already running, please stop instance first.`
 });
 
 const successMessages = Object.freeze({

package/package.json

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