iobroker.javascript 9.1.1 → 9.2.0

package/build/main.js

@@ -225,6 +225,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 +578,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
@@ -911,6 +924,7 @@ class JavaScript extends adapter_core_1.Adapter {
                     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();
                     // Anthropic, Gemini, and DeepSeek always require an API key; OpenAI-compatible allows empty key with custom base URL
                     if (!apiKey &&
@@ -947,19 +961,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');
@@ -988,14 +1009,16 @@ class JavaScript extends adapter_core_1.Adapter {
                             if (res.statusCode === 200) {
                                 try {
                                     const parsed = JSON.parse(data);
+                                    const message = provider === 'anthropic' ? null : parsed.choices?.[0]?.message;
                                     const content = provider === 'anthropic'
                                         ? parsed.content?.[0]?.text || ''
-                                        : parsed.choices?.[0]?.message?.content || '';
-                                    if (!content) {
+                                        : message?.content || '';
+                                    const 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 }, obj.callback);
+                                        this.sendTo(obj.from, obj.command, { success: true, content, ...(tool_calls ? { tool_calls } : {}) }, obj.callback);
                                     }
                                 }
                                 catch {
@@ -1003,17 +1026,17 @@ class JavaScript extends adapter_core_1.Adapter {
                                 }
                             }
                             else {
-                                let errorMsg = `API returned status ${res.statusCode}`;
+                                let detail = '';
                                 try {
-                                    const parsed = JSON.parse(data);
-                                    if (parsed.error?.message) {
-                                        errorMsg = parsed.error.message;
-                                    }
+                                    const errParsed = JSON.parse(data);
+                                    detail = errParsed.error?.message || data.substring(0, 200);
                                 }
                                 catch {
-                                    // ignore parse error
+                                    detail = data.substring(0, 200);
                                 }
-                                this.sendTo(obj.from, obj.command, { error: errorMsg }, obj.callback);
+                                this.sendTo(obj.from, obj.command, {
+                                    error: `${detail || httpStatusText(res.statusCode || 0)} (${res.statusCode})`,
+                                }, obj.callback);
                             }
                         });
                     });
@@ -1106,7 +1129,18 @@ class JavaScript extends adapter_core_1.Adapter {
                                 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);
+                                // 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);
                             }
                         });
                     });
@@ -1281,6 +1315,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 +2183,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 +2269,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]) {