Makes sure to return promise from setObject logic. …

CHANGELOG.md

@@ -3,6 +3,11 @@
 	Placeholder for the next version (at the beginning of the line):
 	## __WORK IN PROGRESS__
 -->
+
+## __WORK IN PROGRESS__
+* (Apollon77) Fixes async usage of extendObject
+* (Apollon77) Makes setObject async save
+
 ## 7.0.3 (2024-11-13) - Lucy
 * (@foxriver76) Introduce "Vendor Packages Workflow" (only relevant for vendors - see README.md)
 

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

@@ -2765,14 +2765,22 @@
         this._intervals.delete(interval as NodeJS.Timeout);
     }
 
-    setObject(id: string, obj: ioBroker.SettableObject, callback?: ioBroker.SetObjectCallback): Promise<void>;
+    setObject(
+        id: string,
+        obj: ioBroker.SettableObject,
+        callback?: ioBroker.SetObjectCallback,
+    ): Promise<ioBroker.NonNullCallbackReturnTypeOf<ioBroker.SetObjectCallback> | void>;
     setObject(
         id: string,
         obj: ioBroker.SettableObject,
         options: unknown,
         callback?: ioBroker.SetObjectCallback,
-    ): Promise<void>;
-    setObject(id: string, obj: ioBroker.SettableObject, callback?: ioBroker.SetObjectCallback): Promise<void>;
+    ): Promise<ioBroker.NonNullCallbackReturnTypeOf<ioBroker.SetObjectCallback> | void>;
+    setObject(
+        id: string,
+        obj: ioBroker.SettableObject,
+        callback?: ioBroker.SetObjectCallback,
+    ): Promise<ioBroker.NonNullCallbackReturnTypeOf<ioBroker.SetObjectCallback> | void>;
     /**
      * Creates or overwrites an object in objectDB.
      *
@@ -2803,7 +2811,12 @@
      *            }
      *        ```
      */
-    setObject(id: unknown, obj: unknown, options: unknown, callback?: unknown): Promise<void> | void {
+    setObject(
+        id: unknown,
+        obj: unknown,
+        options: unknown,
+        callback?: unknown,
+    ): Promise<ioBroker.NonNullCallbackReturnTypeOf<ioBroker.SetObjectCallback> | void> {
         if (typeof options === 'function') {
             callback = options;
             options = null;
@@ -2819,7 +2832,9 @@
         return this._setObject({ id, obj: obj as ioBroker.SettableObject, options, callback });
     }
 
-    private async _setObject(options: InternalSetObjectOptions): Promise<void> {
+    private async _setObject(
+        options: InternalSetObjectOptions,
+    ): Promise<ioBroker.NonNullCallbackReturnTypeOf<ioBroker.SetObjectCallback> | void> {
         if (!this._defaultObjs) {
             this._defaultObjs = (await import('./defaultObjs.js')).createDefaults();
         }
@@ -2844,6 +2859,7 @@
                 this._utils.validateId(options.id, false, null);
             } catch (e) {
                 this._logger.error(tools.appendStackTrace(`${this.namespaceLog} ${e.message}`));
+                // Error is logged and silently ignored to not break older adapters
                 return;
             }
         }
@@ -2921,11 +2937,11 @@
             options.obj.user = options.obj.user || (options.options ? options.options.user : '') || SYSTEM_ADMIN_USER;
             options.obj.ts = options.obj.ts || Date.now();
 
-            this._setObjectWithDefaultValue(options.id, options.obj, options.options, options.callback);
-        } else {
-            this._logger.error(`${this.namespaceLog} setObject ${options.id} mandatory property type missing!`);
-            return tools.maybeCallbackWithError(options.callback, 'mandatory property type missing!');
+            return this._setObjectWithDefaultValue(options.id, options.obj, options.options, options.callback);
         }
+
+        this._logger.error(`${this.namespaceLog} setObject ${options.id} mandatory property type missing!`);
+        return tools.maybeCallbackWithError(options.callback, 'mandatory property type missing!');
     }
 
     /**
@@ -3357,7 +3373,12 @@
      *            }
      *        ```
      */
-    setForeignObject(id: unknown, obj: unknown, options: unknown, callback?: unknown): MaybePromise {
+    setForeignObject(
+        id: unknown,
+        obj: unknown,
+        options: unknown,
+        callback?: unknown,
+    ): Promise<ioBroker.NonNullCallbackReturnTypeOf<ioBroker.SetObjectCallback> | void> | void {
         if (typeof options === 'function') {
             callback = options;
             options = null;
@@ -3386,7 +3407,9 @@
         return this._setForeignObject({ id, obj: obj as ioBroker.SettableObject, options, callback });
     }
 
-    private _setForeignObject(_options: InternalSetObjectOptions): MaybePromise {
+    private _setForeignObject(
+        _options: InternalSetObjectOptions,
+    ): Promise<ioBroker.NonNullCallbackReturnTypeOf<ioBroker.SetObjectCallback> | void> | void {
         const { options, callback, obj } = _options;
         let { id } = _options;
 
@@ -3426,7 +3449,7 @@
             }
         }
 
-        this._setObjectWithDefaultValue(id, obj, options, callback);
+        return this._setObjectWithDefaultValue(id, obj, options, callback);
     }
 
     // external signatures
@@ -9316,7 +9339,7 @@
                 return tools.maybeCallbackWithError(callback, e);
             }
         }
-        this.#states.delState(id, callback);
+        await this.#states.delState(id, callback);
     }
 
     // external signature
@@ -9784,7 +9807,7 @@
 
                 subs[pattern][this.namespace]++;
                 this.outputCount++;
-                this.#states.setState(`system.adapter.${autoSubEntry}.subscribes`, JSON.stringify(subs));
+                await this.#states.setState(`system.adapter.${autoSubEntry}.subscribes`, JSON.stringify(subs));
             }
         }
 
@@ -10013,7 +10036,7 @@
                         delete subs[pattern];
                     }
                     this.outputCount++;
-                    this.#states.setState(`system.adapter.${autoSub}.subscribes`, JSON.stringify(subs));
+                    await this.#states.setState(`system.adapter.${autoSub}.subscribes`, JSON.stringify(subs));
                 }
             }
         }