@iobroker/js-controller-cli 7.0.3 → 7.0.4-alpha.1-20241120-1e3f92f91

package/build/esm/lib/setup.js

@@ -19,7 +19,7 @@ import { CLIProcess } from '../lib/cli/cliProcess.js';
 import { CLIMessage } from '../lib/cli/cliMessage.js';
 import { CLIPlugin } from '../lib/cli/cliPlugin.js';
 import { error as CLIError } from '../lib/cli/messages.js';
-import { getRepository, ignoreVersion, recognizeVersion } from '../lib/setup/utils.js';
+import { BETA_REPO_URL, getRepository, ignoreVersion, isIntegerLikeInput, recognizeVersion, STABLE_REPO_URL, } from '../lib/setup/utils.js';
 import { dbConnect, dbConnectAsync, exitApplicationSave } from '../lib/setup/dbConnection.js';
 import { IoBrokerError } from '../lib/setup/customError.js';
 import * as url from 'node:url';
@@ -27,6 +27,7 @@ import * as events from 'node:events';
 // eslint-disable-next-line unicorn/prefer-module
 const thisDir = url.fileURLToPath(new URL('.', import.meta.url || `file://${__filename}`));
 import { createRequire } from 'node:module';
+import { SYSTEM_CONFIG_ID, SYSTEM_REPOSITORIES_ID } from '@iobroker/js-controller-common-db/constants';
 // eslint-disable-next-line unicorn/prefer-module
 const require = createRequire(import.meta.url || `file://${__filename}`);
 tools.ensureDNSOrder();
@@ -329,10 +330,10 @@ function initYargs() {
             .command('all', 'Show entire config')
             .command('<adapter>[.<instance>]', 'Status of a specified adapter instance');
     })
-        .command('repo [<name>]', 'Show repo information', yargs => {
+        .command('repo', 'Show repo information', yargs => {
         yargs
-            .command('set <name>', 'Set active repository')
-            .command('del <name>', 'Remove repository')
+            .command('set <name>|<index>', 'Set active repository')
+            .command('del <name>|<index>', 'Remove repository')
             .command('add <name> <url>', 'Add repository')
             .command('addset <name> <url>', 'Add repository and set it as active one')
             .command('show', 'List repositories');
@@ -560,8 +561,8 @@ async function processCommand(command, args, params, callback) {
                     const { Repo } = await import('./setup/setupRepo.js');
                     const repo = new Repo({ objects, states });
                     try {
-                        await repo.rename('default', 'stable', 'http://download.iobroker.net/sources-dist.json');
-                        await repo.rename('latest', 'beta', 'http://download.iobroker.net/sources-dist-latest.json');
+                        await repo.rename('default', 'stable', STABLE_REPO_URL);
+                        await repo.rename('latest', 'beta', BETA_REPO_URL);
                     }
                     catch (err) {
                         console.warn(`Cannot rename: ${err.message}`);
@@ -2240,7 +2241,7 @@ async function processCommand(command, args, params, callback) {
         }
         case 'repo': {
             let repoUrlOrCommand = args[0]; // Repo url or name or "add" / "del" / "set" / "show" / "addset" / "unset"
-            const repoName = args[1]; // Repo url or name
+            let repoName = args[1]; // Repo url or name
             let repoUrl = args[2]; // Repo url or name
             if (repoUrlOrCommand !== 'add' &&
                 repoUrlOrCommand !== 'del' &&
@@ -2251,95 +2252,103 @@ async function processCommand(command, args, params, callback) {
                 repoUrl = repoUrlOrCommand;
                 repoUrlOrCommand = 'show';
             }
-            dbConnect(params, async ({ objects, states }) => {
-                const { Repo } = await import('./setup/setupRepo.js');
-                const repo = new Repo({
-                    objects,
-                    states,
-                });
-                if (repoUrlOrCommand === 'show') {
+            const { objects, states } = await dbConnectAsync(false, params);
+            const { Repo } = await import('./setup/setupRepo.js');
+            const repo = new Repo({
+                objects,
+                states,
+            });
+            if (repoUrlOrCommand === 'show') {
+                try {
+                    await repo.showRepoStatus();
+                    return void callback();
+                }
+                catch (e) {
+                    console.error(`Cannot show repository status: ${e.message}`);
+                    return void callback(EXIT_CODES.INVALID_REPO);
+                }
+            }
+            if (repoUrlOrCommand === 'add' ||
+                repoUrlOrCommand === 'del' ||
+                repoUrlOrCommand === 'set' ||
+                repoUrlOrCommand === 'addset' ||
+                repoUrlOrCommand === 'unset') {
+                if (!repoName || !repoName.match(/[-_\w]+/)) {
+                    console.error(`Invalid repository name: "${repoName}"`);
+                    return void callback(EXIT_CODES.INVALID_ARGUMENTS);
+                }
+                if (isIntegerLikeInput(repoName)) {
                     try {
+                        repoName = await repo.getNameByIndex(parseInt(repoName));
+                    }
+                    catch (e) {
+                        console.error(e.message);
+                        return void callback(EXIT_CODES.INVALID_ARGUMENTS);
+                    }
+                }
+                if (repoUrlOrCommand === 'add' || repoUrlOrCommand === 'addset') {
+                    if (!repoUrl) {
+                        console.warn(`Please define repository URL or path: ${tools.appName.toLowerCase()} add <repoName> <repoUrlOrPath>`);
+                        return void callback(EXIT_CODES.INVALID_ARGUMENTS);
+                    }
+                    try {
+                        await repo.add(repoName, repoUrl);
+                        if (repoUrlOrCommand === 'addset') {
+                            await repo.setActive(repoName);
+                            console.log(`Repository "${repoName}" set as active: "${repoUrl}"`);
+                            await repo.showRepoStatus();
+                            return void callback();
+                        }
+                        console.log(`Repository "${repoName}" added as "${repoUrl}"`);
                         await repo.showRepoStatus();
                         return void callback();
                     }
-                    catch (err) {
-                        console.error(`Cannot show repository status: ${err.message}`);
+                    catch (e) {
+                        console.error(`Cannot add repository location: ${e.message}`);
                         return void callback(EXIT_CODES.INVALID_REPO);
                     }
                 }
-                else if (repoUrlOrCommand === 'add' ||
-                    repoUrlOrCommand === 'del' ||
-                    repoUrlOrCommand === 'set' ||
-                    repoUrlOrCommand === 'addset' ||
-                    repoUrlOrCommand === 'unset') {
-                    if (!repoName || !repoName.match(/[-_\w\d]+/)) {
-                        console.error(`Invalid repository name: "${repoName}"`);
+                else if (repoUrlOrCommand === 'set') {
+                    try {
+                        await repo.setActive(repoName);
+                        console.log(`Repository "${repoName}" set as active.`);
+                        await repo.showRepoStatus();
                         return void callback();
                     }
-                    if (repoUrlOrCommand === 'add' || repoUrlOrCommand === 'addset') {
-                        if (!repoUrl) {
-                            console.warn(`Please define repository URL or path: ${tools.appName.toLowerCase()} add <repoName> <repoUrlOrPath>`);
-                            return void callback(EXIT_CODES.INVALID_ARGUMENTS);
-                        }
-                        try {
-                            await repo.add(repoName, repoUrl);
-                            if (repoUrlOrCommand === 'addset') {
-                                await repo.setActive(repoName);
-                                console.log(`Repository "${repoName}" set as active: "${repoUrl}"`);
-                                await repo.showRepoStatus();
-                                return void callback();
-                            }
-                            console.log(`Repository "${repoName}" added as "${repoUrl}"`);
-                            await repo.showRepoStatus();
-                            return void callback();
-                        }
-                        catch (err) {
-                            console.error(`Cannot add repository location: ${err.message}`);
-                            return void callback(EXIT_CODES.INVALID_REPO);
-                        }
+                    catch (e) {
+                        console.error(`Cannot activate repository: ${e.message}`);
+                        return void callback(EXIT_CODES.INVALID_REPO);
                     }
-                    else if (repoUrlOrCommand === 'set') {
-                        try {
-                            await repo.setActive(repoName);
-                            console.log(`Repository "${repoName}" set as active.`);
-                            await repo.showRepoStatus();
-                            return void callback();
-                        }
-                        catch (err) {
-                            console.error(`Cannot activate repository: ${err.message}`);
-                            return void callback(EXIT_CODES.INVALID_REPO);
-                        }
+                }
+                else if (repoUrlOrCommand === 'del') {
+                    try {
+                        await repo.del(repoName);
+                        console.log(`Repository "${repoName}" deleted.`);
+                        await repo.showRepoStatus();
+                        return void callback();
                     }
-                    else if (repoUrlOrCommand === 'del') {
-                        try {
-                            await repo.del(repoName);
-                            console.log(`Repository "${repoName}" deleted.`);
-                            await repo.showRepoStatus();
-                            return void callback();
-                        }
-                        catch (err) {
-                            console.error(`Cannot remove repository: ${err.message}`);
-                            return void callback(EXIT_CODES.INVALID_REPO);
-                        }
+                    catch (e) {
+                        console.error(`Cannot remove repository: ${e.message}`);
+                        return void callback(EXIT_CODES.INVALID_REPO);
                     }
-                    else if (repoUrlOrCommand === 'unset') {
-                        try {
-                            await repo.setInactive(repoName);
-                            console.log(`Repository "${repoName}" deactivated.`);
-                            await repo.showRepoStatus();
-                            return void callback();
-                        }
-                        catch (err) {
-                            console.error(`Cannot deactivate repository: ${err.message}`);
-                            return void callback(EXIT_CODES.INVALID_REPO);
-                        }
+                }
+                else if (repoUrlOrCommand === 'unset') {
+                    try {
+                        await repo.setInactive(repoName);
+                        console.log(`Repository "${repoName}" deactivated.`);
+                        await repo.showRepoStatus();
+                        return void callback();
                     }
-                    else {
-                        console.warn(`Unknown repo command: ${repoUrlOrCommand}`);
-                        return void callback(EXIT_CODES.INVALID_ARGUMENTS);
+                    catch (e) {
+                        console.error(`Cannot deactivate repository: ${e.message}`);
+                        return void callback(EXIT_CODES.INVALID_REPO);
                     }
                 }
-            });
+                else {
+                    console.warn(`Unknown repo command: ${repoUrlOrCommand}`);
+                    return void callback(EXIT_CODES.INVALID_ARGUMENTS);
+                }
+            }
             break;
         }
         case 'multihost':
@@ -2503,10 +2512,10 @@ const OBJECTS_THAT_CANNOT_BE_DELETED = [
     'alias.0',
     'enum.functions',
     'enum.rooms',
-    'system.config',
+    SYSTEM_CONFIG_ID,
     'system.group.administrator',
     'system.group.user',
-    'system.repositories',
+    SYSTEM_REPOSITORIES_ID,
     'system.user.admin',
 ];
 /**
@@ -2578,40 +2587,39 @@ async function cleanDatabase(isDeleteDb) {
     const keysCount = await delStates();
     return keysCount;
 }
-function unsetup(params, callback) {
-    dbConnect(params, ({ objects }) => {
-        objects.delObject('system.meta.uuid', err => {
-            if (err) {
-                console.log(`uuid cannot be deleted: ${err.message}`);
+async function unsetup(params, callback) {
+    const { objects } = await dbConnectAsync(false, params);
+    objects.delObject('system.meta.uuid', err => {
+        if (err) {
+            console.log(`uuid cannot be deleted: ${err.message}`);
+        }
+        else {
+            console.log('system.meta.uuid deleted');
+        }
+        objects.getObject(SYSTEM_CONFIG_ID, (_err, obj) => {
+            if (obj?.common.licenseConfirmed || obj?.common.language || obj?.native?.secret) {
+                obj.common.language = 'en';
+                // allow with parameter --keepsecret to not delete the secret
+                // This is very specific use case for vendors and must not be described in documentation
+                if (!params.keepsecret) {
+                    obj.common.licenseConfirmed = false;
+                    obj.native && delete obj.native.secret;
+                }
+                obj.from = `system.host.${tools.getHostName()}.cli`;
+                obj.ts = new Date().getTime();
+                objects.setObject(SYSTEM_CONFIG_ID, obj, err => {
+                    if (err) {
+                        console.log(`not found: ${err.message}`);
+                        return void callback(EXIT_CODES.CANNOT_SET_OBJECT);
+                    }
+                    console.log(`${SYSTEM_CONFIG_ID} reset`);
+                    return void callback();
+                });
             }
             else {
-                console.log('system.meta.uuid deleted');
+                console.log(`${SYSTEM_CONFIG_ID} is OK`);
+                return void callback();
             }
-            objects.getObject('system.config', (_err, obj) => {
-                if (obj?.common.licenseConfirmed || obj?.common.language || obj?.native?.secret) {
-                    obj.common.language = 'en';
-                    // allow with parameter --keepsecret to not delete the secret
-                    // This is very specific use case for vendors and must not be described in documentation
-                    if (!params.keepsecret) {
-                        obj.common.licenseConfirmed = false;
-                        obj.native && delete obj.native.secret;
-                    }
-                    obj.from = `system.host.${tools.getHostName()}.cli`;
-                    obj.ts = new Date().getTime();
-                    objects.setObject('system.config', obj, err => {
-                        if (err) {
-                            console.log(`not found: ${err.message}`);
-                            return void callback(EXIT_CODES.CANNOT_SET_OBJECT);
-                        }
-                        console.log('system.config reset');
-                        return void callback();
-                    });
-                }
-                else {
-                    console.log('system.config is OK');
-                    return void callback();
-                }
-            });
         });
     });
 }