@iobroker/js-controller-adapter 7.0.4-alpha.1-20241120-1e3f92f91 → 7.0.4

package/build/cjs/lib/adapter/adapter.d.ts

@@ -124,9 +124,17 @@ export interface AdapterClass {
     checkGroupAsync(user: string, group: string, options?: unknown): Promise<boolean>;
     /** <INTERNAL> Determines the users permissions */
     calculatePermissionsAsync(user: string, commandsPermissions: CommandsPermissions, options?: unknown): Promise<ioBroker.PermissionSet>;
-    /** Creates or overwrites an object in the object db */
+    /**
+     * Creates or overwrites an object in the object db
+     *
+     * @deprecated use `adapter.setObject` without a callback instead
+     */
     setObjectAsync(id: string, obj: ioBroker.SettableObject, options?: unknown): ioBroker.SetObjectPromise;
-    /** Creates or overwrites an object (which might not belong to this adapter) in the object db */
+    /**
+     * Creates or overwrites an object (which might not belong to this adapter) in the object db
+     *
+     * @deprecated use `adapter.setForeignObject` without a callback instead
+     */
     setForeignObjectAsync<T extends string>(id: T, obj: ioBroker.SettableObject<ioBroker.ObjectIdToObjectType<T, 'write'>>, options?: unknown): ioBroker.SetObjectPromise;
     getCertificatesAsync(publicName?: string, privateName?: string, chainedName?: string): Promise<GetCertificatesPromiseReturnType>;
     /** Get all states, channels, devices and folders of this adapter */
@@ -483,9 +491,10 @@ export declare class AdapterClass extends EventEmitter {
     delay(timeout: number): Promise<void>;
     setInterval<TCallback extends TimeoutCallback>(cb: TCallback, timeout: number, ...args: Parameters<TCallback>): ioBroker.Interval | undefined;
     clearInterval(interval: ioBroker.Interval | undefined): void;
-    setObject(id: string, obj: ioBroker.SettableObject, callback?: ioBroker.SetObjectCallback): Promise<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>;
+    setObject(id: string, obj: ioBroker.SettableObject): Promise<ioBroker.NonNullCallbackReturnTypeOf<ioBroker.SetObjectCallback>>;
+    setObject(id: string, obj: ioBroker.SettableObject, callback: ioBroker.SetObjectCallback): void;
+    setObject(id: string, obj: ioBroker.SettableObject, options: unknown, callback: ioBroker.SetObjectCallback): void;
+    setObject(id: string, obj: ioBroker.SettableObject, options: unknown): Promise<ioBroker.NonNullCallbackReturnTypeOf<ioBroker.SetObjectCallback>>;
     private _setObject;
     /**
      * Helper method for `set[Foreign]Object[NotExists]` that also sets the default value if one is configured
@@ -503,11 +512,15 @@ export declare class AdapterClass extends EventEmitter {
     extendObject(id: string, objPart: ioBroker.PartialObject, options: ioBroker.ExtendObjectOptions): ioBroker.SetObjectPromise;
     extendObject(id: string, objPart: ioBroker.PartialObject, options: ioBroker.ExtendObjectOptions, callback?: ioBroker.SetObjectCallback): void;
     private _extendObject;
-    setForeignObject<T extends string>(id: T, obj: ioBroker.SettableObject<ioBroker.ObjectIdToObjectType<T, 'write'>>, callback?: ioBroker.SetObjectCallback): void;
-    setForeignObject<T extends string>(id: T, obj: ioBroker.SettableObject<ioBroker.ObjectIdToObjectType<T, 'write'>>, options: unknown, callback?: ioBroker.SetObjectCallback): void;
+    setForeignObject<T extends string>(id: T, obj: ioBroker.SettableObject<ioBroker.ObjectIdToObjectType<T, 'write'>>): Promise<ioBroker.NonNullCallbackReturnTypeOf<ioBroker.SetObjectCallback>>;
+    setForeignObject<T extends string>(id: T, obj: ioBroker.SettableObject<ioBroker.ObjectIdToObjectType<T, 'write'>>, callback: ioBroker.SetObjectCallback): void;
+    setForeignObject<T extends string>(id: T, obj: ioBroker.SettableObject<ioBroker.ObjectIdToObjectType<T, 'write'>>, options: unknown): Promise<ioBroker.NonNullCallbackReturnTypeOf<ioBroker.SetObjectCallback>>;
+    setForeignObject<T extends string>(id: T, obj: ioBroker.SettableObject<ioBroker.ObjectIdToObjectType<T, 'write'>>, options: unknown, callback?: ioBroker.SetObjectCallback): void | Promise<ioBroker.NonNullCallbackReturnTypeOf<ioBroker.SetObjectCallback>>;
     private _setForeignObject;
-    extendForeignObject<T extends string>(id: T, objPart: ioBroker.PartialObject<ioBroker.ObjectIdToObjectType<T, 'write'>>, callback?: ioBroker.SetObjectCallback): void;
-    extendForeignObject<T extends string>(id: T, objPart: ioBroker.PartialObject<ioBroker.ObjectIdToObjectType<T, 'write'>>, options: ioBroker.ExtendObjectOptions, callback?: ioBroker.SetObjectCallback): void;
+    extendForeignObject<T extends string>(id: T, objPart: ioBroker.PartialObject<ioBroker.ObjectIdToObjectType<T, 'write'>>): Promise<ioBroker.CallbackReturnTypeOf<ioBroker.SetObjectCallback>>;
+    extendForeignObject<T extends string>(id: T, objPart: ioBroker.PartialObject<ioBroker.ObjectIdToObjectType<T, 'write'>>, callback: ioBroker.SetObjectCallback): void;
+    extendForeignObject<T extends string>(id: T, objPart: ioBroker.PartialObject<ioBroker.ObjectIdToObjectType<T, 'write'>>, options: ioBroker.ExtendObjectOptions, callback: ioBroker.SetObjectCallback): void;
+    extendForeignObject<T extends string>(id: T, objPart: ioBroker.PartialObject<ioBroker.ObjectIdToObjectType<T, 'write'>>, options: ioBroker.ExtendObjectOptions): Promise<ioBroker.CallbackReturnTypeOf<ioBroker.SetObjectCallback>>;
     private _extendForeignObjectAsync;
     objectExists(id: string, options?: Record<string, any> | null): Promise<boolean | void>;
     foreignObjectExists(id: string, options?: Record<string, any> | null): Promise<boolean | void>;

package/build/cjs/lib/adapter/adapter.js

@@ -1608,11 +1608,10 @@ class AdapterClass extends import_node_events.EventEmitter {
       options.obj.from = options.obj.from || `system.adapter.${this.namespace}`;
       options.obj.user = options.obj.user || (options.options ? options.options.user : "") || import_constants.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 import_js_controller_common.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 import_js_controller_common.tools.maybeCallbackWithError(options.callback, "mandatory property type missing!");
   }
   /**
    * Helper method for `set[Foreign]Object[NotExists]` that also sets the default value if one is configured
@@ -1971,7 +1970,7 @@ class AdapterClass extends import_node_events.EventEmitter {
         }
       }
     }
-    this._setObjectWithDefaultValue(id, obj, options, callback);
+    return this._setObjectWithDefaultValue(id, obj, options, callback);
   }
   /**
    * Same as {@link AdapterClass.extendObject}, but for any object.
@@ -6091,7 +6090,7 @@ class AdapterClass extends import_node_events.EventEmitter {
         return import_js_controller_common.tools.maybeCallbackWithError(callback, e);
       }
     }
-    this.#states.delState(id, callback);
+    await this.#states.delState(id, callback);
   }
   /**
    * Read all states of this adapter, that pass the pattern
@@ -6433,7 +6432,7 @@ class AdapterClass extends import_node_events.EventEmitter {
         }
         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));
       }
     }
     if (Array.isArray(pattern)) {
@@ -6597,7 +6596,7 @@ class AdapterClass extends import_node_events.EventEmitter {
             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));
         }
       }
     }