Update plugin-base and sentry

Apollon77 · Apollon77 · commit 6c2d35f1cff6 · 2025-10-15T22:37:37.000+02:00
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/adapter/package.json b/packages/adapter/package.json
@@ -15,7 +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": "~2.0.1",
+        "@iobroker/plugin-base": "~3.0.1",
         "deep-clone": "^3.0.3",
         "fs-extra": "^11.3.2",
         "jsonwebtoken": "^9.0.0",
diff --git a/packages/adapter/src/lib/adapter/adapter.ts b/packages/adapter/src/lib/adapter/adapter.ts
@@ -1494,68 +1494,83 @@ export class AdapterClass extends EventEmitter {
         }
         this.terminated = true;
 
-        this.pluginHandler && this.pluginHandler.destroyAll();
-
-        if (this._reportInterval) {
-            clearInterval(this._reportInterval);
-            this._reportInterval = null;
-        }
-        if (this._restartScheduleJob) {
-            this._restartScheduleJob.cancel();
-            this._restartScheduleJob = null;
-        }
+        let shutdownStarted = false;
+        const shutdownLogic: () => void = () => {
+            if (shutdownStarted) {
+                return;
+            }
+            shutdownStarted = true;
 
-        let _reason = 'Without reason';
-        let _exitCode: number;
+            if (this._reportInterval) {
+                clearInterval(this._reportInterval);
+                this._reportInterval = null;
+            }
+            if (this._restartScheduleJob) {
+                this._restartScheduleJob.cancel();
+                this._restartScheduleJob = null;
+            }
 
-        if (typeof reason === 'number') {
-            // Only the exit code was passed
-            exitCode = reason;
-            _reason = 'Without reason';
-        } else if (reason && typeof reason === 'string') {
-            _reason = reason;
-        }
+            let _reason = 'Without reason';
+            let _exitCode: number;
 
-        if (typeof exitCode !== 'number') {
-            _exitCode = !this._config.isInstall ? EXIT_CODES.ADAPTER_REQUESTED_TERMINATION : EXIT_CODES.NO_ERROR;
-        } else {
-            _exitCode = exitCode;
-        }
-
-        const isNotCritical =
-            _exitCode === EXIT_CODES.ADAPTER_REQUESTED_TERMINATION ||
-            _exitCode === EXIT_CODES.START_IMMEDIATELY_AFTER_STOP ||
-            _exitCode === EXIT_CODES.NO_ERROR;
-        const text = `${this.namespaceLog} Terminated (${Validator.getErrorText(_exitCode)}): ${_reason}`;
-        if (isNotCritical) {
-            this._logger.info(text);
-        } else {
-            this._logger.warn(text);
-        }
-        setTimeout(async () => {
-            // give last states some time to get handled
-            if (this.#states) {
-                try {
-                    await this.#states.destroy();
-                } catch {
-                    // ignore
-                }
+            if (typeof reason === 'number') {
+                // Only the exit code was passed
+                exitCode = reason;
+                _reason = 'Without reason';
+            } else if (reason && typeof reason === 'string') {
+                _reason = reason;
             }
-            if (this.#objects) {
-                try {
-                    await this.#objects.destroy();
-                } catch {
-                    //ignore
-                }
+
+            if (typeof exitCode !== 'number') {
+                _exitCode = !this._config.isInstall ? EXIT_CODES.ADAPTER_REQUESTED_TERMINATION : EXIT_CODES.NO_ERROR;
+            } else {
+                _exitCode = exitCode;
             }
-            if (this.startedInCompactMode) {
-                this.emit('exit', _exitCode, reason);
-                this.#states = null;
-                this.#objects = null;
+
+            const isNotCritical =
+                _exitCode === EXIT_CODES.ADAPTER_REQUESTED_TERMINATION ||
+                _exitCode === EXIT_CODES.START_IMMEDIATELY_AFTER_STOP ||
+                _exitCode === EXIT_CODES.NO_ERROR;
+            const text = `${this.namespaceLog} Terminated (${Validator.getErrorText(_exitCode)}): ${_reason}`;
+            if (isNotCritical) {
+                this._logger.info(text);
             } else {
-                process.exit(_exitCode);
+                this._logger.warn(text);
             }
-        }, 500);
+            setTimeout(async () => {
+                // give last states some time to get handled
+                if (this.#states) {
+                    try {
+                        await this.#states.destroy();
+                    } catch {
+                        // ignore
+                    }
+                }
+                if (this.#objects) {
+                    try {
+                        await this.#objects.destroy();
+                    } catch {
+                        //ignore
+                    }
+                }
+                if (this.startedInCompactMode) {
+                    this.emit('exit', _exitCode, reason);
+                    this.#states = null;
+                    this.#objects = null;
+                } else {
+                    process.exit(_exitCode);
+                }
+            }, 500);
+        };
+
+        if (this.pluginHandler) {
+            this.pluginHandler
+                .destroyAll()
+                .then(() => shutdownLogic())
+                .catch(() => shutdownLogic());
+        } else {
+            shutdownLogic();
+        }
     }
 
     // external signature
@@ -11071,10 +11086,10 @@ export class AdapterClass extends EventEmitter {
                                     thisDir,
                                 );
                                 this.pluginHandler.setDatabaseForPlugin(pluginName, this.#objects, this.#states);
-                                this.pluginHandler.initPlugin(pluginName, this.adapterConfig || {});
+                                await this.pluginHandler.initPlugin(pluginName, this.adapterConfig || {});
                             }
                         } else {
-                            if (!this.pluginHandler.destroy(pluginName)) {
+                            if (!(await this.pluginHandler.destroy(pluginName))) {
                                 this._logger.info(
                                     `${this.namespaceLog} Plugin ${pluginName} could not be disabled. Please restart adapter to disable it.`,
                                 );
diff --git a/packages/cli/package.json b/packages/cli/package.json
@@ -8,10 +8,10 @@
     "dependencies": {
         "@iobroker/js-controller-common": "file:../common",
         "@iobroker/js-controller-common-db": "file:../common-db",
-        "@iobroker/plugin-base": "~2.0.1",
+        "@iobroker/plugin-base": "~3.0.1",
         "axios": "^1.12.0",
         "chokidar": "^3.5.3",
-        "debug": "^4.3.4",
+        "debug": "^4.4.3",
         "deep-clone": "^3.0.3",
         "event-stream": "^4.0.1",
         "fs-extra": "^11.3.2",
diff --git a/packages/cli/src/lib/setup/dbConnection.ts b/packages/cli/src/lib/setup/dbConnection.ts
@@ -359,7 +359,7 @@ export async function resetDbConnect(): Promise<void> {
     }
 
     if (pluginHandler) {
-        pluginHandler.destroyAll();
+        await pluginHandler.destroyAll();
     }
 }
 
diff --git a/packages/controller/package.json b/packages/controller/package.json
@@ -20,11 +20,11 @@
         "@iobroker/js-controller-cli": "file:../cli",
         "@iobroker/js-controller-common": "file:../common",
         "@iobroker/js-controller-common-db": "file:../common-db",
-        "@iobroker/plugin-base": "~2.0.1",
-        "@iobroker/plugin-sentry": "~2.0.4",
+        "@iobroker/plugin-base": "~3.0.1",
+        "@iobroker/plugin-sentry": "~3.0.0",
         "axios": "^1.12.0",
         "cron-parser": "^4.9.0",
-        "debug": "^4.3.4",
+        "debug": "^4.4.3",
         "decache": "^4.6.1",
         "deep-clone": "^3.0.3",
         "fs-extra": "^11.3.2",
diff --git a/packages/controller/src/main.ts b/packages/controller/src/main.ts
@@ -616,10 +616,10 @@ function createStates(onConnect: () => void): void {
                                 controllerDir,
                             );
                             pluginHandler.setDatabaseForPlugin(pluginName, objects, states);
-                            pluginHandler.initPlugin(pluginName, ioPackage);
+                            await pluginHandler.initPlugin(pluginName, ioPackage);
                         }
                     } else {
-                        if (!pluginHandler.destroy(pluginName)) {
+                        if (!(await pluginHandler.destroy(pluginName))) {
                             logger.info(
                                 `${hostLogPrefix} Plugin ${pluginName} could not be disabled. Please restart ioBroker to disable it.`,
                             );
@@ -5141,7 +5141,7 @@ function stop(force?: boolean, callback?: () => void): void {
     }
 
     stopInstances(force, async wasForced => {
-        pluginHandler.destroyAll();
+        await pluginHandler.destroyAll();
         notificationHandler && notificationHandler.storeNotifications();
 
         try {

Original file line number	Diff line number	Diff line change
`@@ -359,7 +359,7 @@ export async function resetDbConnect(): Promise<void> {`
`359`	`359`	`}`
`360`	`360`
`361`	`361`	`if (pluginHandler) {`
`362`		`- pluginHandler.destroyAll();`
	`362`	`+ await pluginHandler.destroyAll();`
`363`	`363`	`}`
`364`	`364`	`}`
`365`	`365`