iobroker.javascript 9.1.1 → 9.2.1

package/build/main.js

@@ -78,6 +78,8 @@ 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 aiProviderResolver_1 = require("./lib/aiProviderResolver");
+const anthropicAdapter_1 = require("./lib/anthropicAdapter");
 const eventObj_1 = require("./lib/eventObj");
 const scheduler_1 = require("./lib/scheduler");
 const typescriptSettings_1 = require("./lib/typescriptSettings");
@@ -225,6 +227,19 @@ const jsDeclarationServer = new virtual_tsc_1.Server(typescriptSettings_1.jsDecl
  * Stores the IDs of script objects whose change should be ignored because
  * the compiled source was just updated
  */
+function httpStatusText(code) {
+    const texts = {
+        400: 'Bad Request',
+        401: 'Unauthorized',
+        403: 'Forbidden',
+        404: 'Not Found',
+        429: 'Too Many Requests / Rate Limit',
+        500: 'Internal Server Error',
+        502: 'Bad Gateway',
+        503: 'Service Unavailable',
+    };
+    return texts[code] || `Error ${code}`;
+}
 class JavaScript extends adapter_core_1.Adapter {
     context;
     errorLogFunction = {
@@ -565,9 +580,9 @@ class JavaScript extends adapter_core_1.Adapter {
                         await this.loadScriptById(id);
                     }
                 }
-                else {
-                    // if (obj.common.source !== formerObj.common.source) {
-                    // Source changed => restart the script
+                else if (obj.common.engine === `system.adapter.${this.namespace}` ||
+                    formerObj.common.engine === `system.adapter.${this.namespace}`) {
+                    // Source changed => restart the script (only on the relevant instance)
                     this.stopCounters[id] = this.stopCounters[id] ? this.stopCounters[id] + 1 : 1;
                     void this.stopScript(id).then(() => {
                         // only start again after stop when "last" object change to prevent problems on
@@ -905,13 +920,15 @@ class JavaScript extends adapter_core_1.Adapter {
                 break;
             }
             case 'chatCompletion': {
-                // Proxy chat completion requests to an OpenAI-compatible API endpoint
+                // Proxy chat completion requests to an OpenAI-compatible API endpoint.
+                // API keys are resolved server-side from encryptedNative config — they never
+                // leave the adapter (frontend only sends `provider`, not the key).
                 if (obj.callback) {
-                    const baseUrl = (obj.message?.baseUrl || '').trim();
-                    const apiKey = (obj.message?.apiKey || '').trim();
                     const chatModel = (obj.message?.model || '').trim();
                     const messages = obj.message?.messages;
+                    const tools = obj.message?.tools;
                     const provider = (obj.message?.provider || 'openai').trim();
+                    const { apiKey, baseUrl } = (0, aiProviderResolver_1.resolveProviderCredentials)(this.config, provider, obj.message?.baseUrl);
                     // Anthropic, Gemini, and DeepSeek always require an API key; OpenAI-compatible allows empty key with custom base URL
                     if (!apiKey &&
                         (provider === 'anthropic' || provider === 'gemini' || provider === 'deepseek' || !baseUrl)) {
@@ -931,15 +948,16 @@ class JavaScript extends adapter_core_1.Adapter {
                         url = 'https://api.anthropic.com/v1/messages';
                         chatHeaders['x-api-key'] = apiKey;
                         chatHeaders['anthropic-version'] = '2023-06-01';
-                        const systemMessages = messages.filter((m) => m.role === 'system');
-                        const nonSystemMessages = messages.filter((m) => m.role !== 'system');
-                        const systemText = systemMessages.map((m) => m.content).join('\n\n');
+                        // Translate OpenAI-format messages/tools into Anthropic's content-block format.
+                        const { system: systemText, messages: anthropicMessages } = (0, anthropicAdapter_1.translateMessagesToAnthropic)(messages);
+                        const anthropicTools = tools?.length ? (0, anthropicAdapter_1.translateToolsToAnthropic)(tools) : [];
                         bodyObj = {
                             model: chatModel,
                             max_tokens: 8192,
                             stream: false,
                             ...(systemText ? { system: systemText } : {}),
-                            messages: nonSystemMessages,
+                            messages: anthropicMessages,
+                            ...(anthropicTools.length ? { tools: anthropicTools } : {}),
                         };
                     }
                     else if (provider === 'gemini') {
@@ -947,19 +965,26 @@ class JavaScript extends adapter_core_1.Adapter {
                         if (apiKey) {
                             chatHeaders.Authorization = `Bearer ${apiKey}`;
                         }
-                        bodyObj = { model: chatModel, messages, stream: false };
+                        bodyObj = { model: chatModel, messages, stream: false, ...(tools?.length ? { tools } : {}) };
                     }
                     else if (provider === 'deepseek') {
                         url = 'https://api.deepseek.com/chat/completions';
                         chatHeaders.Authorization = `Bearer ${apiKey}`;
-                        bodyObj = { model: chatModel, messages, stream: false };
+                        bodyObj = { model: chatModel, messages, stream: false, ...(tools?.length ? { tools } : {}) };
                     }
                     else {
                         url = `${baseUrl || 'https://api.openai.com/v1'}/chat/completions`;
                         if (apiKey) {
                             chatHeaders.Authorization = `Bearer ${apiKey}`;
                         }
-                        bodyObj = { model: chatModel, messages, stream: false };
+                        bodyObj = {
+                            model: chatModel,
+                            messages,
+                            stream: false,
+                            ...(tools?.length ? { tools } : {}),
+                            // Disable thinking/reasoning for local models to save context and speed
+                            ...(baseUrl ? { reasoning_effort: 'none' } : {}),
+                        };
                     }
                     const body = JSON.stringify(bodyObj);
                     const bodyBuffer = Buffer.from(body, 'utf8');
@@ -974,67 +999,86 @@ class JavaScript extends adapter_core_1.Adapter {
                     }
                     const isHttps = urlObj.protocol === 'https:';
                     const requestModule = isHttps ? https : http;
-                    const req = requestModule.request(url, {
-                        method: 'POST',
-                        headers: chatHeaders,
-                        timeout: 600000,
-                        ...(isHttps && this.config.allowSelfSignedCerts ? { rejectUnauthorized: false } : {}),
-                    }, res => {
-                        let data = '';
-                        res.on('data', (chunk) => {
-                            data += chunk.toString();
-                        });
-                        res.on('end', () => {
-                            if (res.statusCode === 200) {
-                                try {
-                                    const parsed = JSON.parse(data);
-                                    const content = provider === 'anthropic'
-                                        ? parsed.content?.[0]?.text || ''
-                                        : parsed.choices?.[0]?.message?.content || '';
-                                    if (!content) {
-                                        this.sendTo(obj.from, obj.command, { error: 'Empty response from API' }, obj.callback);
+                    try {
+                        const req = requestModule.request(url, {
+                            method: 'POST',
+                            headers: chatHeaders,
+                            timeout: 600000,
+                            ...(isHttps && this.config.allowSelfSignedCerts ? { rejectUnauthorized: false } : {}),
+                        }, res => {
+                            let data = '';
+                            res.on('data', (chunk) => {
+                                data += chunk.toString();
+                            });
+                            res.on('end', () => {
+                                if (res.statusCode === 200) {
+                                    try {
+                                        const parsed = JSON.parse(data);
+                                        let content;
+                                        let tool_calls;
+                                        if (provider === 'anthropic') {
+                                            const translated = (0, anthropicAdapter_1.translateAnthropicResponseToOpenAI)(parsed);
+                                            content = translated.content;
+                                            tool_calls = translated.tool_calls;
+                                        }
+                                        else {
+                                            const message = parsed.choices?.[0]?.message;
+                                            content = message?.content || '';
+                                            tool_calls = message?.tool_calls;
+                                        }
+                                        if (!content && !tool_calls?.length) {
+                                            this.sendTo(obj.from, obj.command, { error: 'Empty response from API' }, obj.callback);
+                                        }
+                                        else {
+                                            this.sendTo(obj.from, obj.command, {
+                                                success: true,
+                                                content,
+                                                ...(tool_calls ? { tool_calls } : {}),
+                                            }, obj.callback);
+                                        }
                                     }
-                                    else {
-                                        this.sendTo(obj.from, obj.command, { success: true, content }, obj.callback);
+                                    catch {
+                                        this.sendTo(obj.from, obj.command, { error: 'Invalid JSON response from API' }, obj.callback);
                                     }
                                 }
-                                catch {
-                                    this.sendTo(obj.from, obj.command, { error: 'Invalid JSON response from API' }, obj.callback);
-                                }
-                            }
-                            else {
-                                let errorMsg = `API returned status ${res.statusCode}`;
-                                try {
-                                    const parsed = JSON.parse(data);
-                                    if (parsed.error?.message) {
-                                        errorMsg = parsed.error.message;
+                                else {
+                                    let detail = '';
+                                    try {
+                                        const errParsed = JSON.parse(data);
+                                        detail = errParsed.error?.message || data.substring(0, 200);
                                     }
+                                    catch {
+                                        detail = data.substring(0, 200);
+                                    }
+                                    this.sendTo(obj.from, obj.command, {
+                                        error: `${detail || httpStatusText(res.statusCode || 0)} (${res.statusCode})`,
+                                    }, obj.callback);
                                 }
-                                catch {
-                                    // ignore parse error
-                                }
-                                this.sendTo(obj.from, obj.command, { error: errorMsg }, obj.callback);
-                            }
+                            });
                         });
-                    });
-                    req.on('error', (err) => {
-                        this.sendTo(obj.from, obj.command, { error: `Connection failed: ${err.message}` }, obj.callback);
-                    });
-                    req.on('timeout', () => {
-                        req.destroy();
-                        this.sendTo(obj.from, obj.command, { error: 'Connection timeout (600s)' }, obj.callback);
-                    });
-                    req.write(bodyBuffer);
-                    req.end();
+                        req.on('error', (err) => {
+                            this.sendTo(obj.from, obj.command, { error: `Connection failed: ${err.message}` }, obj.callback);
+                        });
+                        req.on('timeout', () => {
+                            req.destroy();
+                            this.sendTo(obj.from, obj.command, { error: 'Connection timeout (600s)' }, obj.callback);
+                        });
+                        req.write(bodyBuffer);
+                        req.end();
+                    }
+                    catch (error) {
+                        this.sendTo(obj.from, obj.command, { error: `Connection failed: ${error.toString()}` }, obj.callback);
+                    }
                 }
                 break;
             }
             case 'testApiConnection': {
-                // Test connection to an OpenAI-compatible API endpoint
+                // Test connection to an OpenAI-compatible API endpoint.
+                // The settings-dialog Test button sends the current form value as `apiKey`
+                // (so users can test before saving); otherwise we fall back to the stored key.
                 if (obj.callback) {
-                    const baseUrl = (obj.message?.baseUrl || '').trim();
-                    const apiKey = (obj.message?.apiKey || '').trim();
                     const provider = (obj.message?.provider || 'openai').trim();
+                    const { apiKey, baseUrl } = (0, aiProviderResolver_1.resolveTestCredentials)(this.config, provider, obj.message?.apiKey, obj.message?.baseUrl);
                     // Anthropic, Gemini, and DeepSeek always require an API key; OpenAI-compatible allows empty key with custom base URL
                     if (!apiKey &&
                         (provider === 'anthropic' || provider === 'gemini' || provider === 'deepseek' || !baseUrl)) {
@@ -1076,48 +1120,72 @@ class JavaScript extends adapter_core_1.Adapter {
                     }
                     const isHttps = urlObj.protocol === 'https:';
                     const requestModule = isHttps ? https : http;
-                    const req = requestModule.request(url, {
-                        method: 'GET',
-                        headers: testHeaders,
-                        timeout: 10000,
-                        ...(isHttps && this.config.allowSelfSignedCerts ? { rejectUnauthorized: false } : {}),
-                    }, res => {
-                        let data = '';
-                        res.on('data', (chunk) => {
-                            data += chunk.toString();
-                        });
-                        res.on('end', () => {
-                            if (res.statusCode === 200) {
-                                try {
-                                    const parsed = JSON.parse(data);
-                                    const models = (parsed.data || [])
-                                        .map((m) => m.id.startsWith('models/') ? m.id.substring(7) : m.id)
-                                        .sort();
-                                    this.sendTo(obj.from, obj.command, { success: true, models, count: models.length }, obj.callback);
+                    try {
+                        const req = requestModule.request(url, {
+                            method: 'GET',
+                            headers: testHeaders,
+                            timeout: 10000,
+                            ...(isHttps && this.config.allowSelfSignedCerts ? { rejectUnauthorized: false } : {}),
+                        }, res => {
+                            let data = '';
+                            res.on('data', (chunk) => {
+                                data += chunk.toString();
+                            });
+                            res.on('end', () => {
+                                if (res.statusCode === 200) {
+                                    try {
+                                        const parsed = JSON.parse(data);
+                                        const models = (parsed.data || [])
+                                            .map((m) => m.id.startsWith('models/') ? m.id.substring(7) : m.id)
+                                            .sort();
+                                        this.sendTo(obj.from, obj.command, { success: true, models, count: models.length }, obj.callback);
+                                    }
+                                    catch {
+                                        this.sendTo(obj.from, obj.command, { error: 'Invalid JSON response from API' }, obj.callback);
+                                    }
                                 }
-                                catch {
-                                    this.sendTo(obj.from, obj.command, { error: 'Invalid JSON response from API' }, obj.callback);
+                                else if (res.statusCode === 401) {
+                                    this.sendTo(obj.from, obj.command, { error: 'Invalid API key (401)' }, obj.callback);
                                 }
-                            }
-                            else if (res.statusCode === 401) {
-                                this.sendTo(obj.from, obj.command, { error: 'Invalid API key (401)' }, obj.callback);
-                            }
-                            else if (res.statusCode === 403) {
-                                this.sendTo(obj.from, obj.command, { error: 'Access denied (403)' }, obj.callback);
-                            }
-                            else {
-                                this.sendTo(obj.from, obj.command, { error: `API returned status ${res.statusCode}` }, obj.callback);
-                            }
+                                else if (res.statusCode === 403) {
+                                    this.sendTo(obj.from, obj.command, { error: 'Access denied (403)' }, obj.callback);
+                                }
+                                else {
+                                    // Include response body for debugging
+                                    let detail = '';
+                                    try {
+                                        const errParsed = JSON.parse(data);
+                                        detail = errParsed.error?.message || data.substring(0, 200);
+                                    }
+                                    catch {
+                                        detail = data.substring(0, 200);
+                                    }
+                                    this.sendTo(obj.from, obj.command, {
+                                        error: `${detail || httpStatusText(res.statusCode || 0)} (${res.statusCode})`,
+                                    }, obj.callback);
+                                }
+                            });
                         });
-                    });
-                    req.on('error', (err) => {
-                        this.sendTo(obj.from, obj.command, { error: `Connection failed: ${err.message}` }, obj.callback);
-                    });
-                    req.on('timeout', () => {
-                        req.destroy();
-                        this.sendTo(obj.from, obj.command, { error: 'Connection timeout (10s)' }, obj.callback);
-                    });
-                    req.end();
+                        req.on('error', (err) => {
+                            this.sendTo(obj.from, obj.command, { error: `Connection failed: ${err.message}` }, obj.callback);
+                        });
+                        req.on('timeout', () => {
+                            req.destroy();
+                            this.sendTo(obj.from, obj.command, { error: 'Connection timeout (10s)' }, obj.callback);
+                        });
+                        req.end();
+                    }
+                    catch (error) {
+                        this.sendTo(obj.from, obj.command, { error: `Connection failed: ${error.toString()}` }, obj.callback);
+                    }
+                }
+                break;
+            }
+            case 'getAvailableAiProviders': {
+                // Reports which AI providers have stored credentials (keys never leave the backend).
+                if (obj.callback) {
+                    const providers = (0, aiProviderResolver_1.listAvailableProviders)(this.config);
+                    this.sendTo(obj.from, obj.command, { providers }, obj.callback);
                 }
                 break;
             }
@@ -1281,6 +1349,10 @@ class JavaScript extends adapter_core_1.Adapter {
         this.context.allowSelfSignedCerts = this.config.allowSelfSignedCerts;
         const doc = await this.getObjectViewAsync('script', 'javascript', {});
         if (doc?.rows?.length) {
+            // sort global scripts if configured
+            if (this.config.sortGlobalScriptsAlphabetically) {
+                doc.rows.sort((a, b) => a.value._id.localeCompare(b.value._id));
+            }
             // assemble global script
             for (let g = 0; g < doc.rows.length; g++) {
                 const obj = doc.rows[g].value;
@@ -2145,6 +2217,9 @@ class JavaScript extends adapter_core_1.Adapter {
         }
     }
     async stopScript(name) {
+        if (!this.scripts[name]) {
+            return false;
+        }
         this.log.info(`${name}: Stopping script`);
         await this.setState(`scriptEnabled.${name.substring(SCRIPT_CODE_MARKER.length)}`, false, true);
         if (this.messageBusHandlers[name]) {
@@ -2228,6 +2303,20 @@ class JavaScript extends adapter_core_1.Adapter {
             for (let i = 0; i < this.scripts[name].intervals.length; i++) {
                 clearInterval(this.scripts[name].intervals[i]);
             }
+            // Stop all delayed states (setStateDelayed timers)
+            for (const stateId of Object.keys(this.timers)) {
+                if (this.timers[stateId]) {
+                    for (let i = this.timers[stateId].length - 1; i >= 0; i--) {
+                        if (this.timers[stateId][i].scriptName === name) {
+                            clearTimeout(this.timers[stateId][i].t);
+                            this.timers[stateId].splice(i, 1);
+                        }
+                    }
+                    if (!this.timers[stateId].length) {
+                        delete this.timers[stateId];
+                    }
+                }
+            }
             // Stop all scheduled jobs
             for (let i = 0; i < this.scripts[name].schedules.length; i++) {
                 if (this.scripts[name].schedules[i]) {