[chore]: Migrate to plugin-base and plugin-sentry v2 (#2781)

* migrate to plugin base v2 and sentry v2 * finish off migration * resolve merge conflicts * another pack lock update trial * new try node v 20 * pack lock
ioBroker · Jul 12, 2024 · f4f04aa · f4f04aa
1 parent ce8cf50
commit f4f04aa
Show file tree

Hide file tree

Showing 8 changed files with 15,406 additions and 15,413 deletions.
diff --git a/.nvmrc b/.nvmrc
@@ -1 +1 @@
-18
+20
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/adapter/package.json b/packages/adapter/package.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",

diff --git a/packages/adapter/src/lib/adapter/adapter.ts b/packages/adapter/src/lib/adapter/adapter.ts
diff --git a/packages/cli/package.json b/packages/cli/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.6.3",
         "chokidar": "^3.5.3",
         "debug": "^4.3.4",

diff --git a/packages/cli/src/lib/setup/dbConnection.ts b/packages/cli/src/lib/setup/dbConnection.ts
@@ -379,7 +379,7 @@ export async function exitApplicationSave(exitCode?: number): Promise<never> {
  *
  * @param config - parsed content of iobroker.json
  */
-function initializePlugins(config: Record<string, any>): Promise<void> {
+async function initializePlugins(config: Record<string, any>): Promise<void> {
     const ioPackage = fs.readJsonSync(path.join(tools.getControllerDir(), 'io-package.json'));
     const packageJson = fs.readJsonSync(path.join(tools.getControllerDir(), 'package.json'));
     const hostname = tools.getHostName();
@@ -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());
-    });
+    await pluginHandler.initPlugins(ioPackage);
 }
 
 /**

diff --git a/packages/controller/package.json b/packages/controller/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.6.3",
         "cron-parser": "^4.9.0",
         "debug": "^4.3.4",

diff --git a/packages/controller/src/main.ts b/packages/controller/src/main.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';
@@ -613,8 +614,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
@@ -709,16 +710,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;
@@ -3012,8 +3012,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`);