@iobroker/js-controller-adapter 7.0.7-alpha.8-20250324-d7f4b9128 → 7.0.7

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

@@ -282,7 +282,7 @@ export interface InternalGetCertificatesOptions {
 export interface InternalUpdateConfigOptions {
     newConfig: Record<string, any>;
 }
-export type GetEncryptedConfigCallback = (error: Error | null | undefined, result?: string) => void;
+export type GetEncryptedConfigCallback = (error: Error | null | undefined, result?: string | string[]) => void;
 export interface InternalGetEncryptedConfigOptions {
     attribute: string;
     callback?: GetEncryptedConfigCallback;

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

@@ -491,7 +491,7 @@ export declare class AdapterClass extends EventEmitter {
      *
      */
     disable(): ioBroker.SetObjectPromise;
-    getEncryptedConfig(attribute: string, callback?: GetEncryptedConfigCallback): Promise<string | void>;
+    getEncryptedConfig(attribute: string, callback?: GetEncryptedConfigCallback): Promise<string | string[] | void>;
     private _getEncryptedConfig;
     /**
      * Get the system secret, after retrieved once it will be read from the cache
@@ -818,7 +818,7 @@ export declare class AdapterClass extends EventEmitter {
     /**
      * Initialize the adapter
      *
-     * @param adapterConfig the AdapterOptions or the InstanceObject, is null/undefined if it is install process
+     * @param adapterConfig the AdapterOptions or the InstanceObject, is null/undefined if it is an installation process
      */
     private _initAdapter;
     /**

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

@@ -1358,7 +1358,7 @@ class AdapterClass extends import_node_events.EventEmitter {
       mergedConfig = { ...oldConfig, ...newConfig };
     }
     obj.native = mergedConfig;
-    return this.setForeignObjectAsync(configObjId, obj);
+    return this.setForeignObject(configObjId, obj);
   }
   /**
    * Disables and stops the adapter instance.
@@ -1393,8 +1393,17 @@ class AdapterClass extends import_node_events.EventEmitter {
   }
   async _getEncryptedConfig(options) {
     const { attribute, callback } = options;
-    const value = this.config[attribute];
-    if (typeof value === "string") {
+    const value = (0, import_utils.getObjectAttribute)(this.config, attribute);
+    if (Array.isArray(value)) {
+      const secret = await this.getSystemSecret();
+      const result = [];
+      for (let i = 0; i < value.length; i++) {
+        if (typeof value[i] === "string") {
+          result[i] = import_js_controller_common.tools.decrypt(secret, value[i]);
+        }
+      }
+      return import_js_controller_common.tools.maybeCallbackWithError(callback, null, result);
+    } else if (typeof value === "string") {
       const secret = await this.getSystemSecret();
       return import_js_controller_common.tools.maybeCallbackWithError(callback, null, import_js_controller_common.tools.decrypt(secret, value));
     }
@@ -2635,7 +2644,7 @@ class AdapterClass extends import_node_events.EventEmitter {
       }
       if (obj && "protectedNative" in obj && Array.isArray(obj.protectedNative) && obj.native && id && id.startsWith("system.adapter.") && !import_constants.NO_PROTECT_ADAPTERS.includes(this.name) && this.name !== id.split(".")[2]) {
         for (const attr of obj.protectedNative) {
-          delete obj.native[attr];
+          (0, import_utils.deleteObjectAttribute)(obj.native, attr);
         }
       }
     }
@@ -2742,7 +2751,7 @@ class AdapterClass extends import_node_events.EventEmitter {
       const obj = await this.#objects.getObjectAsync(options.id, options);
       if (obj && "protectedNative" in obj && Array.isArray(obj.protectedNative) && obj._id && obj._id.startsWith("system.adapter.") && obj.native && !import_constants.NO_PROTECT_ADAPTERS.includes(this.name) && this.name !== obj._id.split(".")[2]) {
         for (const attr of obj.protectedNative) {
-          delete obj.native[attr];
+          (0, import_utils.deleteObjectAttribute)(obj.native, attr);
         }
       }
       return import_js_controller_common.tools.maybeCallbackWithError(options.callback, null, obj);
@@ -7543,7 +7552,7 @@ class AdapterClass extends import_node_events.EventEmitter {
         }
         if (obj && "protectedNative" in obj && Array.isArray(obj.protectedNative) && obj._id && obj._id.startsWith("system.adapter.") && obj.native && !import_constants.NO_PROTECT_ADAPTERS.includes(this.name) && this.name !== obj._id.split(".")[2]) {
           for (const attr of obj.protectedNative) {
-            delete obj.native[attr];
+            (0, import_utils.deleteObjectAttribute)(obj.native, attr);
           }
         }
         if (this.adapterReady) {
@@ -7615,7 +7624,7 @@ class AdapterClass extends import_node_events.EventEmitter {
   /**
    * Initialize the adapter
    *
-   * @param adapterConfig the AdapterOptions or the InstanceObject, is null/undefined if it is install process
+   * @param adapterConfig the AdapterOptions or the InstanceObject, is null/undefined if it is an installation process
    */
   async _initAdapter(adapterConfig) {
     await this._initLogging();
@@ -7745,7 +7754,7 @@ class AdapterClass extends import_node_events.EventEmitter {
     if (Array.isArray(adapterConfig.encryptedNative)) {
       for (const attr of adapterConfig.encryptedNative) {
         if (typeof this.config[attr] === "string") {
-          promises.push(this.getEncryptedConfig(attr).then((decryptedValue) => this.config[attr] = decryptedValue).catch((e) => this._logger.error(`${this.namespaceLog} Can not decrypt attribute ${attr}: ${e.message}`)));
+          promises.push(this.getEncryptedConfig(attr).then((decryptedValue) => (0, import_utils.setObjectAttribute)(this.config, attr, decryptedValue)).catch((e) => this._logger.error(`${this.namespaceLog} Can not decrypt attribute ${attr}: ${e.message}`)));
         }
       }
     } else {