iobroker.js-controller 6.0.6 → 6.0.7

package/build/esm/main.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"main.d.ts","sourceRoot":"","sources":["../../src/main.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AA+iKH;;;;GAIG;AACH,wBAAsB,IAAI,CAAC,cAAc,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAiajE"}
+{"version":3,"file":"main.d.ts","sourceRoot":"","sources":["../../src/main.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAyjKH;;;;GAIG;AACH,wBAAsB,IAAI,CAAC,cAAc,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAmajE"}

package/build/esm/main.js

@@ -18,7 +18,7 @@ import restart from './lib/restart.js';
 import pidUsage from 'pidusage';
 import deepClone from 'deep-clone';
 import { isDeepStrictEqual, inspect } from 'node:util';
-import { tools, EXIT_CODES, logger as toolsLogger, isLocalObjectsDbServer, isLocalStatesDbServer, NotificationHandler, getObjectsConstructor, getStatesConstructor, zipFiles, getInstancesOrderedByStartPrio } from '@iobroker/js-controller-common';
+import { tools, EXIT_CODES, logger as toolsLogger, isLocalObjectsDbServer, isLocalStatesDbServer, NotificationHandler, getObjectsConstructor, getStatesConstructor, zipFiles, getInstancesOrderedByStartPrio, isInstalledFromNpm } from '@iobroker/js-controller-common';
 import { SYSTEM_ADAPTER_PREFIX, SYSTEM_CONFIG_ID, SYSTEM_HOST_PREFIX, SYSTEM_REPOSITORIES_ID } from '@iobroker/js-controller-common-db/constants';
 import { PluginHandler } from '@iobroker/plugin-base';
 import { BlocklistManager } from './lib/blocklistManager.js';
@@ -57,7 +57,6 @@ if (os.platform() === 'win32') {
     require('loadavg-windows');
 }
 tools.ensureDNSOrder();
-let title = `${tools.appName}.js-controller`;
 let Objects;
 let States;
 let logger;
@@ -80,12 +79,12 @@ let connectTimeout = null;
 let reportInterval = null;
 let primaryHostInterval = null;
 let isPrimary = false;
+/** If system reboot is required */
+let isRebootRequired = false;
 const PRIMARY_HOST_LOCK_TIME = 60_000;
 const VENDOR_BOOTSTRAP_FILE = '/opt/iobroker/iob-vendor-secret.json';
 const VENDOR_FILE = '/etc/iob-vendor.json';
 const procs = {};
-// TODO type is probably InstanceCommon
-const hostAdapter = {};
 const subscribe = {};
 const stopTimeouts = {};
 let states = null;
@@ -472,8 +471,8 @@ function createStates(onConnect) {
                 }
                 if (pluginHandler.isPluginActive(pluginName) !== state.val) {
                     if (state.val) {
-                        if (!pluginHandler.isPluginInstanciated(pluginName)) {
-                            pluginHandler.instanciatePlugin(pluginName, pluginHandler.getPluginConfig(pluginName), controllerDir);
+                        if (!pluginHandler.isPluginInstantiated(pluginName)) {
+                            pluginHandler.instantiatePlugin(pluginName, pluginHandler.getPluginConfig(pluginName), controllerDir);
                             pluginHandler.setDatabaseForPlugin(pluginName, objects, states);
                             pluginHandler.initPlugin(pluginName, ioPackage);
                         }
@@ -548,15 +547,14 @@ async function initializeController() {
         connected = true;
         if (!isStopping) {
             pluginHandler.setDatabaseForPlugins(objects, states);
-            pluginHandler.initPlugins(ioPackage, async () => {
-                states.subscribe(`${hostObjectPrefix}.plugins.*`);
-                // Do not start if we're still stopping the instances
-                await checkHost();
-                startMultihost(config);
-                setMeta();
-                started = true;
-                getInstances();
-            });
+            await pluginHandler.initPlugins(ioPackage);
+            states.subscribe(`${hostObjectPrefix}.plugins.*`);
+            // Do not start if we're still stopping the instances
+            await checkHost();
+            startMultihost(config);
+            setMeta();
+            started = true;
+            getInstances();
         }
     }
     else {
@@ -640,7 +638,6 @@ function createObjects(onConnect) {
                         proc.config.common.host = null;
                         // @ts-expect-error it is only used in checkAndAddInstance, find a way without modifying the InstanceObject
                         proc.config.deleted = true;
-                        delete hostAdapter[id];
                         logger.info(`${hostLogPrefix} object deleted ${id}`);
                     }
                     else {
@@ -660,8 +657,6 @@ function createObjects(onConnect) {
                             compactProcs[proc.config.common.compactGroup].instances.splice(compactProcs[proc.config.common.compactGroup].instances.indexOf(id), 1);
                         }
                         proc.config = obj;
-                        hostAdapter[id] = hostAdapter[id] || {};
-                        hostAdapter[id].config = obj;
                     }
                     if (proc.process || proc.config.common.mode === 'schedule') {
                         proc.restartExpected = true;
@@ -694,7 +689,6 @@ function createObjects(onConnect) {
                             // instance moved -> remove all notifications, new host has to take care
                             await notificationHandler.clearNotifications(null, null, id);
                             delete procs[id];
-                            delete hostAdapter[id];
                         }
                     }
                     else if (installQueue.find(obj => obj.id === id)) {
@@ -721,7 +715,6 @@ function createObjects(onConnect) {
                                 delete proc.restartTimer;
                             }
                             delete procs[id];
-                            delete hostAdapter[id];
                         }
                     }
                 }
@@ -2539,7 +2532,6 @@ async function processMessage(msg) {
             const message = msg.message.message;
             const level = msg.message.level;
             const extraInfo = msg.message.extraInfo;
-            // @ts-expect-error Plugin is not well typed and SentryPlugin has no types at all currently
             const sentryObj = pluginHandler.getPluginInstance('sentry')?.getSentryObject();
             if (!sentryObj) {
                 logger.debug(`${hostLogPrefix} Do not send message "${message}" to Sentry, because it is disabled`);
@@ -2667,10 +2659,6 @@ function checkAndAddInstance(instance, ipArr) {
             ? logger.error(`${hostLogPrefix} Cannot update hostname for ${instance._id}: ${err.message}`)
             : logger.info(`${hostLogPrefix} Set hostname ${hostname} for ${instance._id}`));
     }
-    hostAdapter[instance._id] = hostAdapter[instance._id] || {};
-    if (!hostAdapter[instance._id].config) {
-        hostAdapter[instance._id].config = deepClone(instance);
-    }
     if (!instanceRelevantForThisController(instance, ipArr)) {
         return false;
     }
@@ -3137,7 +3125,11 @@ async function startScheduledInstance(callback) {
             if (proc.process) {
                 storePids();
                 const { pid } = proc.process;
-                logger.info(`${hostLogPrefix} instance ${instance._id} started with pid ${proc.process.pid}`);
+                const isNpm = isInstalledFromNpm({
+                    installedFrom: instance.common.installedFrom,
+                    adapterName: instance.common.name
+                });
+                logger.info(`${hostLogPrefix} instance ${instance._id} in version "${instance.common.version}"${!isNpm ? ` (non-npm: ${instance.common.installedFrom})` : ''} started with pid ${proc.process.pid}`);
                 proc.process.on('exit', (code, signal) => {
                     outputCount++;
                     states.setState(`${id}.alive`, { val: false, ack: true, from: hostObjectPrefix });
@@ -3642,7 +3634,11 @@ async function startInstance(id, wakeUp = false) {
                             logger.info(`${hostLogPrefix} instance ${instance._id} is handled by compact group controller pid ${proc.process.pid}`);
                         }
                         else {
-                            logger.info(`${hostLogPrefix} instance ${instance._id} started with pid ${proc.process.pid}`);
+                            const isNpm = isInstalledFromNpm({
+                                installedFrom: instance.common.installedFrom,
+                                adapterName: instance.common.name
+                            });
+                            logger.info(`${hostLogPrefix} instance ${instance._id} in version "${instance.common.version}"${!isNpm ? ` (non-npm: ${instance.common.installedFrom})` : ''} started with pid ${proc.process.pid}`);
                         }
                     }
                 };
@@ -3943,12 +3939,16 @@ async function startInstance(id, wakeUp = false) {
                         cwd: adapterDir
                     });
                 }
-                catch (err) {
-                    logger.info(`${hostLogPrefix} instance ${instance._id} could not be started: ${err}`);
+                catch (e) {
+                    logger.info(`${hostLogPrefix} instance ${instance._id} could not be started: ${e.message}`);
                 }
                 if (proc.process) {
                     storePids();
-                    logger.info(`${hostLogPrefix} instance ${instance._id} started with pid ${proc.process.pid}`);
+                    const isNpm = isInstalledFromNpm({
+                        installedFrom: instance.common.installedFrom,
+                        adapterName: instance.common.name
+                    });
+                    logger.info(`${hostLogPrefix} instance ${instance._id} in version "${instance.common.version}"${!isNpm ? ` (non-npm: ${instance.common.installedFrom})` : ''} started with pid ${proc.process.pid}`);
                     proc.process.on('exit', (code, signal) => {
                         cleanAutoSubscribes(id, () => {
                             const proc = procs[id];
@@ -4372,6 +4372,7 @@ function stop(force, callback) {
  * @param compactGroupId the id of the compact group
  */
 export async function init(compactGroupId) {
+    let title = `${tools.appName}.js-controller`;
     if (compactGroupId) {
         compactGroupController = true;
         compactGroup = compactGroupId;
@@ -4863,15 +4864,15 @@ async function startUpgradeManager(options) {
  * Checks if a system reboot is required and generates a notification if this is the case
  */
 async function checkRebootRequired() {
-    if (process.platform !== 'linux') {
+    if (process.platform !== 'linux' || isRebootRequired) {
         return;
     }
     /** This file exists on most linux systems if a reboot is required */
     const rebootRequiredPath = '/var/run/reboot-required';
     /** This file contains a list of packages which require the reboot, separated by newline */
     const packagesListPath = '/var/run/reboot-required.pkgs';
-    const rebootRequired = await fs.pathExists(rebootRequiredPath);
-    if (!rebootRequired) {
+    isRebootRequired = await fs.pathExists(rebootRequiredPath);
+    if (!isRebootRequired) {
         return;
     }
     let message = 'At least one package update requires a system reboot';