[chore]: update to plugin v2 (base + sentry) (#2863)

* merge

* regenerated pack lock

* pack lock update

* what is wrong with that pack lock

* drop a line in changelog

* re-generate pack lock

* update pack lock

Author: foxriver76

CHANGELOG.md

@@ -5,6 +5,7 @@
 -->
 
 ## __WORK IN PROGRESS__
+* (@foxriver76) updated plugin base and sentry plugin to version 2
 * (@foxriver76) enhanced translations for the `diskSpaceIssues` notification category
 * (@foxriver76) improved backup/restore process to work for arbitrary large installations
 

package-lock.json

@@ -15,8 +15,7 @@
         "@iobroker/db-states-redis": "file:../db-states-redis",
         "@iobroker/js-controller-common": "file:../common",
         "@iobroker/js-controller-common-db": "file:../common-db",
-        "@iobroker/plugin-base": "~1.2.1",
-        "@iobroker/plugin-sentry": "~1.2.1",
+        "@iobroker/plugin-base": "~2.0.1",
         "deep-clone": "^3.0.3",
         "fs-extra": "^11.1.0",
         "jsonwebtoken": "^9.0.0",

packages/adapter/package.json

@@ -8,6 +8,7 @@
     "dependencies": {
         "@iobroker/js-controller-common": "file:../common",
         "@iobroker/js-controller-common-db": "file:../common-db",
+        "@iobroker/plugin-base": "~2.0.1",
         "axios": "^1.7.4",
         "chokidar": "^3.5.3",
         "debug": "^4.3.4",

packages/adapter/src/lib/adapter/adapter.ts

@@ -413,9 +413,7 @@ function initializePlugins(config: Record<string, any>): Promise<void> {
     pluginHandler.addPlugins(config.plugins, tools.getControllerDir()); // ... plugins from iobroker.json
     pluginHandler.setDatabaseForPlugins(objects, states);
 
-    return new Promise(resolve => {
-        pluginHandler.initPlugins(ioPackage, () => resolve());
-    });
+    return pluginHandler.initPlugins(ioPackage);
 }
 
 /**

packages/cli/package.json

@@ -20,8 +20,8 @@
         "@iobroker/js-controller-cli": "file:../cli",
         "@iobroker/js-controller-common": "file:../common",
         "@iobroker/js-controller-common-db": "file:../common-db",
-        "@iobroker/plugin-base": "~1.2.1",
-        "@iobroker/plugin-sentry": "~1.2.1",
+        "@iobroker/plugin-base": "~2.0.1",
+        "@iobroker/plugin-sentry": "~2.0.4",
         "axios": "^1.7.4",
         "cron-parser": "^4.9.0",
         "debug": "^4.3.4",

packages/cli/src/lib/setup/dbConnection.ts

@@ -39,6 +39,7 @@ import {
     SYSTEM_REPOSITORIES_ID
 } from '@iobroker/js-controller-common-db/constants';
 import { PluginHandler } from '@iobroker/plugin-base';
+import type SentryPlugin from '@iobroker/plugin-sentry';
 import { BlocklistManager } from '@/lib/blocklistManager.js';
 import type { Client as ObjectsClient } from '@iobroker/db-objects-redis';
 import type { Client as StatesClient } from '@iobroker/db-states-redis';
@@ -616,8 +617,8 @@ function createStates(onConnect: () => void): void {
                 }
                 if (pluginHandler.isPluginActive(pluginName) !== state.val) {
                     if (state.val) {
-                        if (!pluginHandler.isPluginInstanciated(pluginName)) {
-                            pluginHandler.instanciatePlugin(
+                        if (!pluginHandler.isPluginInstantiated(pluginName)) {
+                            pluginHandler.instantiatePlugin(
                                 pluginName,
                                 pluginHandler.getPluginConfig(pluginName)!,
                                 controllerDir
@@ -712,16 +713,15 @@ async function initializeController(): Promise<void> {
         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 {
         connected = true;
@@ -3015,8 +3015,9 @@ async function processMessage(msg: ioBroker.SendableMessage): Promise<null | voi
             const level: string = msg.message.level;
             const extraInfo: Record<string, unknown> = 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();
+            const sentryObj = (
+                pluginHandler.getPluginInstance('sentry') as InstanceType<typeof SentryPlugin> | null
+            )?.getSentryObject();
 
             if (!sentryObj) {
                 logger.debug(`${hostLogPrefix} Do not send message "${message}" to Sentry, because it is disabled`);