iobroker.javascript 10.0.0 → 10.1.1

package/build/main.js

@@ -78,6 +78,7 @@ const protectFs_1 = __importDefault(require("./lib/protectFs"));
 const words_1 = require("./lib/words");
 const sandbox_1 = require("./lib/sandbox");
 const nodeModulesManagement_1 = require("./lib/nodeModulesManagement");
+const secrets_1 = require("./lib/secrets");
 const aiProviderResolver_1 = require("./lib/aiProviderResolver");
 const anthropicAdapter_1 = require("./lib/anthropicAdapter");
 const eventObj_1 = require("./lib/eventObj");
@@ -89,7 +90,11 @@ const crypto_1 = require("./lib/crypto");
 /**
  * List of forbidden Locations for a mirror directory
  * relative to the default data directory
- * ATTENTION: the same list is also located in index_m.html!!
+ *
+ * ATTENTION: the same list is also in the `validator` of `mirrorPath` in `admin/jsonConfig.json`,
+ * which rejects such a path before it is saved. That one has to assume the default installation
+ * directory, because the browser cannot know where the data directory of the host is - so this check
+ * here is the authoritative one and stays.
  */
 const forbiddenMirrorLocations = [
     'backup-objects',
@@ -324,6 +329,11 @@ class JavaScript extends adapter_core_1.Adapter {
     aiCredentialCache = new Map();
     /** Unsubscribe callbacks for the AI credential subscriptions (manager mode). */
     aiCredentialUnsubscribers = [];
+    /**
+     * Decrypted credentials of the central ioBroker credential store (`system.credentials.*`),
+     * exposed to the scripts as the global `SECRETS` object. Kept up to date by `onObjectChange`.
+     */
+    secretsManager = new secrets_1.SecretsManager(this);
     globalScript = '';
     /** Generated declarations for global TypeScripts */
     globalDeclarations = '';
@@ -475,6 +485,7 @@ class JavaScript extends adapter_core_1.Adapter {
             adapter: this,
             logError: this.logError.bind(this),
             allowSelfSignedCerts: false,
+            secrets: this.secretsManager.secrets,
         };
         this.tsServer = new virtual_tsc_1.Server(typescriptSettings_1.tsCompilerOptions, this.tsLog);
     }
@@ -505,6 +516,16 @@ class JavaScript extends adapter_core_1.Adapter {
                 this._enums.delete(id);
             }
         }
+        // Keep the decrypted credentials (global `SECRETS`) in sync with the central credential store
+        if ((0, secrets_1.isSecretId)(id)) {
+            if (obj) {
+                await this.secretsManager.update(id);
+            }
+            else {
+                this.secretsManager.remove(id);
+            }
+            this.updateSecretsDeclarations();
+        }
         // IO-9: Invalidate sendTo instance-cache when adapter instances change
         if (id.startsWith('system.adapter.')) {
             const parts = id.split('.');
@@ -773,6 +794,7 @@ class JavaScript extends adapter_core_1.Adapter {
                 this.setStateCountCheckInterval = null;
             }
             await this.unsubscribeAiCredentials();
+            this.secretsManager.destroy();
             await this.stopAllScripts();
         }
         catch (err) {
@@ -982,7 +1004,7 @@ class JavaScript extends adapter_core_1.Adapter {
                 const typings = {};
                 // try to load TypeScript lib files from disk
                 try {
-                    const typescriptLibs = (0, typescriptTools_1.resolveTypescriptLibs)(typescriptSettings_1.targetTsLib);
+                    const typescriptLibs = (0, typescriptTools_1.resolveTypescriptLibs)((0, typescriptSettings_1.getTargetTsLib)(this.config));
                     Object.assign(typings, typescriptLibs);
                 }
                 catch {
@@ -1397,6 +1419,18 @@ class JavaScript extends adapter_core_1.Adapter {
                 }
                 break;
             }
+            case 'getSecrets': {
+                // Reports which credentials exist and which fields they have, so the instance
+                // settings and the Blockly editor can show the available `SECRETS.<name>.<field>`
+                // expressions. The decrypted values never leave the backend.
+                if (obj.callback) {
+                    this.sendTo(obj.from, obj.command, {
+                        enabled: this.config.enableSecrets !== false,
+                        secrets: this.secretsManager.getStructure(),
+                    }, obj.callback);
+                }
+                break;
+            }
             case 'prettier': {
                 // Format the code with Prettier
                 if (obj.message && typeof obj.message.code === 'string') {
@@ -1546,6 +1580,9 @@ class JavaScript extends adapter_core_1.Adapter {
         this.activeStr = `${this.namespace}.scriptEnabled.`;
         this.mods.fs = new protectFs_1.default(this.log, (0, adapter_core_1.getAbsoluteDefaultDataDir)());
         this.mods['fs/promises'] = this.mods.fs.promises; // to avoid require('fs/promises');
+        // The instance configuration is only available now, so the compiler has to be created again
+        // with the options the user has selected in the "TypeScript" tab
+        this.tsServer = new virtual_tsc_1.Server((0, typescriptSettings_1.getTsCompilerOptions)(this.config), this.tsLog);
         // try to read TS declarations
         try {
             tsAmbient = {
@@ -1581,6 +1618,10 @@ class JavaScript extends adapter_core_1.Adapter {
         // In `manager` credential mode, subscribe to the configured AI credentials so changes in the
         // central credential store are picked up live (the keys are cached for the AI sendTo handlers).
         await this.subscribeAiCredentials();
+        // Read the central credential store, so the scripts can use `SECRETS.<name>.<field>`.
+        // Later changes are picked up in `onObjectChange`.
+        await this.secretsManager.load(this.config.enableSecrets !== false);
+        this.updateSecretsDeclarations();
         const doc = await this.getObjectViewAsync('script', 'javascript', {});
         if (doc?.rows?.length) {
             // sort global scripts if configured
@@ -1752,6 +1793,23 @@ class JavaScript extends adapter_core_1.Adapter {
             }
         }, 60_000).unref();
     }
+    /**
+     * Publishes the names of the existing credentials as ambient declarations, so the editor can
+     * suggest them after typing `SECRETS.` and the TypeScript compiler knows them.
+     */
+    updateSecretsDeclarations() {
+        if (!tsAmbient) {
+            return;
+        }
+        const declarationPath = 'secrets.d.ts';
+        const declarations = this.secretsManager.getDeclarations();
+        if (tsAmbient[declarationPath] === declarations) {
+            return;
+        }
+        tsAmbient[declarationPath] = declarations;
+        this.tsServer.provideAmbientDeclarations({ [declarationPath]: declarations });
+        jsDeclarationServer.provideAmbientDeclarations({ [declarationPath]: declarations });
+    }
     loadTypeScriptDeclarations() {
         // try to load the typings on disk for all 3rd party modules
         const packages = [
@@ -1794,9 +1852,7 @@ class JavaScript extends adapter_core_1.Adapter {
             }
         }
         for (const pkg of packages) {
-            let pkgTypings = (0, typescriptTools_1.resolveTypings)(pkg, this.getAdapterScopedPackageIdentifier ? this.getAdapterScopedPackageIdentifier(pkg) : pkg, 
-            // node needs ambient typings, so we don't wrap it in declare module
-            pkg !== 'node');
+            let pkgTypings = (0, typescriptTools_1.resolveTypings)(pkg, this.getAdapterScopedPackageIdentifier ? this.getAdapterScopedPackageIdentifier(pkg) : pkg);
             if (!pkgTypings) {
                 // Create the empty dummy declarations so users don't get the "not found" error
                 // for installed packages