iobroker.js-controller 6.0.6 → 6.0.7

package/build/cjs/main.js

@@ -69,7 +69,6 @@ if (import_node_os.default.platform() === "win32") {
   require2("loadavg-windows");
 }
 import_js_controller_common.tools.ensureDNSOrder();
-let title = `${import_js_controller_common.tools.appName}.js-controller`;
 let Objects;
 let States;
 let logger;
@@ -92,11 +91,11 @@ let connectTimeout = null;
 let reportInterval = null;
 let primaryHostInterval = null;
 let isPrimary = false;
+let isRebootRequired = false;
 const PRIMARY_HOST_LOCK_TIME = 6e4;
 const VENDOR_BOOTSTRAP_FILE = "/opt/iobroker/iob-vendor-secret.json";
 const VENDOR_FILE = "/etc/iob-vendor.json";
 const procs = {};
-const hostAdapter = {};
 const subscribe = {};
 const stopTimeouts = {};
 let states = null;
@@ -407,8 +406,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);
             }
@@ -475,14 +474,13 @@ async function initializeController() {
     connected = true;
     if (!isStopping) {
       pluginHandler.setDatabaseForPlugins(objects, states);
-      pluginHandler.initPlugins(ioPackage, async () => {
-        states.subscribe(`${hostObjectPrefix}.plugins.*`);
-        await checkHost();
-        startMultihost(config);
-        setMeta();
-        started = true;
-        getInstances();
-      });
+      await pluginHandler.initPlugins(ioPackage);
+      states.subscribe(`${hostObjectPrefix}.plugins.*`);
+      await checkHost();
+      startMultihost(config);
+      setMeta();
+      started = true;
+      getInstances();
     }
   } else {
     connected = true;
@@ -545,7 +543,6 @@ function createObjects(onConnect) {
             proc.config.common.enabled = false;
             proc.config.common.host = null;
             proc.config.deleted = true;
-            delete hostAdapter[id];
             logger.info(`${hostLogPrefix} object deleted ${id}`);
           } else {
             if (proc.config.common.enabled && !obj.common.enabled) {
@@ -559,8 +556,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;
@@ -587,7 +582,6 @@ function createObjects(onConnect) {
               }
               await notificationHandler.clearNotifications(null, null, id);
               delete procs[id];
-              delete hostAdapter[id];
             }
           } else if (installQueue.find((obj2) => obj2.id === id)) {
             logger.debug(`${hostLogPrefix} ignore object change because the adapter is still in installation/rebuild queue`);
@@ -606,7 +600,6 @@ function createObjects(onConnect) {
                 delete proc.restartTimer;
               }
               delete procs[id];
-              delete hostAdapter[id];
             }
           }
         } else if (obj?.common) {
@@ -2196,10 +2189,6 @@ function checkAndAddInstance(instance, ipArr) {
     instance.common.host = hostname;
     objects.setObject(instance._id, instance, (err) => err ? 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 = (0, import_deep_clone.default)(instance);
-  }
   if (!instanceRelevantForThisController(instance, ipArr)) {
     return false;
   }
@@ -2583,7 +2572,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 = (0, import_js_controller_common.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 });
@@ -2981,7 +2974,11 @@ async function startInstance(id, wakeUp = false) {
             } else if (proc2.startedAsCompactGroup) {
               logger.info(`${hostLogPrefix} instance ${instance._id} is handled by compact group controller pid ${proc2.process.pid}`);
             } else {
-              logger.info(`${hostLogPrefix} instance ${instance._id} started with pid ${proc2.process.pid}`);
+              const isNpm = (0, import_js_controller_common.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 ${proc2.process.pid}`);
             }
           }
         };
@@ -3227,12 +3224,16 @@ async function startInstance(id, wakeUp = false) {
             windowsHide: true,
             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 = (0, import_js_controller_common.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 proc2 = procs[id];
@@ -3590,6 +3591,7 @@ function stop(force, callback) {
   });
 }
 async function init(compactGroupId) {
+  let title = `${import_js_controller_common.tools.appName}.js-controller`;
   if (compactGroupId) {
     compactGroupController = true;
     compactGroup = compactGroupId;
@@ -3980,13 +3982,13 @@ async function startUpgradeManager(options) {
   upgradeProcess.unref();
 }
 async function checkRebootRequired() {
-  if (process.platform !== "linux") {
+  if (process.platform !== "linux" || isRebootRequired) {
     return;
   }
   const rebootRequiredPath = "/var/run/reboot-required";
   const packagesListPath = "/var/run/reboot-required.pkgs";
-  const rebootRequired = await import_fs_extra.default.pathExists(rebootRequiredPath);
-  if (!rebootRequired) {
+  isRebootRequired = await import_fs_extra.default.pathExists(rebootRequiredPath);
+  if (!isRebootRequired) {
     return;
   }
   let message = "At least one package update requires a system reboot";