@codesys/mcp-toolkit 1.0.8 → 1.0.9

package/dist/codesys_interop.js

@@ -43,7 +43,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.executeCodesysScript = executeCodesysScript;
-const child_process_1 = require("child_process"); // Use spawn directly
+const child_process_1 = require("child_process"); // Still using spawn
 const promises_1 = require("fs/promises");
 const path = __importStar(require("path"));
 const os = __importStar(require("os"));
@@ -52,7 +52,7 @@ const SCRIPT_SUCCESS_MARKER = 'SCRIPT_SUCCESS';
 const SCRIPT_ERROR_MARKER = 'SCRIPT_ERROR';
 /**
  * Executes a CODESYS Python script using the command line interface.
- * Uses spawn for better handling of paths with spaces.
+ * Tries using spawn with shell:true and explicit quoting for cmd.exe.
  *
  * @param scriptContent The Python script code to execute.
  * @param codesysExePath The full path to the CODESYS.exe executable.
@@ -61,54 +61,46 @@ const SCRIPT_ERROR_MARKER = 'SCRIPT_ERROR';
  */
 function executeCodesysScript(scriptContent, codesysExePath, codesysProfileName) {
     return __awaiter(this, void 0, void 0, function* () {
-        // Validate arguments passed to the function
         if (!codesysExePath) {
             throw new Error('CODESYS executable path was not provided to executeCodesysScript.');
         }
         if (!codesysProfileName) {
             throw new Error('CODESYS profile name was not provided to executeCodesysScript.');
         }
-        // Create a temporary file for the script
         const tempDir = os.tmpdir();
-        // Ensure temp file name is safe for command line (though spawn handles args better)
         const tempFileName = `codesys_script_${Date.now()}_${Math.random().toString(36).substring(2, 9)}.py`;
         const tempFilePath = path.join(tempDir, tempFileName);
         let output = '';
         let success = false;
         let exitCode = null;
         try {
-            // Normalize line endings to LF (\n)
             const normalizedScriptContent = scriptContent.replace(/\r\n/g, '\n');
-            // Write the script content to the temporary file using latin1 encoding
             yield (0, promises_1.writeFile)(tempFilePath, normalizedScriptContent, 'latin1');
-            process.stderr.write(`Temporary script written to: ${tempFilePath} with latin1 encoding and LF line endings\n`);
-            // --- Use spawn ---
-            const command = codesysExePath; // The executable itself
-            const args = [
-                `--profile=${codesysProfileName}`, // Format expected by CODESYS.exe
-                '--noUI',
-                `--runscript=${tempFilePath}` // Format expected by CODESYS.exe
-                // If CODESYS requires quotes *around* the profile/script path *value*, adjust like:
-                // `--profile="${codesysProfileName}"`,
-                // `--runscript="${tempFilePath}"`,
-                // But usually, spawn handles the argument separation correctly without needing inner quotes unless the *program itself* requires them.
-                // Test without inner quotes first.
-            ];
-            process.stderr.write(`Spawning: ${command} with args: ${JSON.stringify(args)}\n`);
-            const spawnResult = yield new Promise((resolve, reject) => {
+            process.stderr.write(`Temporary script written to: ${tempFilePath}\n`);
+            // --- Force shell execution with explicit quoting for cmd.exe ---
+            // Meticulously construct the command string exactly as cmd.exe needs it.
+            // Rule 1: The executable path with spaces MUST be quoted.
+            // Rule 2: Arguments containing spaces MUST be quoted (or potentially escaped, but quotes are safer).
+            // Assuming profile name might have spaces, tempFilePath might too (less likely but possible).
+            const commandStringForShell = `"${codesysExePath}" --profile="${codesysProfileName}" --noUI --runscript="${tempFilePath}"`;
+            process.stderr.write(`Attempting to execute via shell: ${commandStringForShell}\n`); // Log the EXACT command
+            const spawnResult = yield new Promise((resolve) => {
                 let stdoutData = '';
                 let stderrData = '';
-                // Spawn the process. Detached:false is default. Timeout via AbortController recommended for spawn.
                 const controller = new AbortController();
                 const timeoutSignal = controller.signal;
                 const timeoutDuration = 30000; // 30 seconds
-                const childProcess = (0, child_process_1.spawn)(command, args, {
-                    windowsHide: true, // Hides the console window on Windows
-                    signal: timeoutSignal // Use AbortSignal for timeout
+                // Use shell: true. Pass the command string directly.
+                // On Windows, this uses cmd.exe.
+                // Pass the command string as the first argument when shell is true and args is empty/undefined.
+                const childProcess = (0, child_process_1.spawn)(commandStringForShell, [], {
+                    shell: true, // FORCE shell usage
+                    windowsHide: false,
+                    signal: timeoutSignal
                 });
                 const timeoutId = setTimeout(() => {
                     process.stderr.write(`TIMEOUT: CODESYS process timed out after ${timeoutDuration / 1000} seconds\n`);
-                    controller.abort(); // Abort the process via the signal
+                    controller.abort();
                 }, timeoutDuration);
                 childProcess.stdout.on('data', (data) => {
                     const chunk = data.toString();
@@ -116,49 +108,37 @@ function executeCodesysScript(scriptContent, codesysExePath, codesysProfileName)
                     process.stderr.write(`CODESYS stdout chunk: ${chunk.length > 100 ? chunk.substring(0, 100) + '...' : chunk}\n`);
                 });
                 childProcess.stderr.on('data', (data) => {
+                    // **** THIS IS CRITICAL - CAPTURE STDERR ****
                     const chunk = data.toString();
                     stderrData += chunk;
-                    process.stderr.write(`CODESYS stderr chunk: ${chunk}\n`); // Log stderr more verbosely
+                    process.stderr.write(`>>>> CODESYS stderr chunk: ${chunk}\n`); // Make stderr highly visible
                 });
                 childProcess.on('error', (error) => {
                     var _a;
-                    clearTimeout(timeoutId); // Clear timeout on explicit error
-                    // This usually means the process couldn't be spawned (e.g., EACCES, ENOENT)
-                    process.stderr.write(`CODESYS spawn error: ${error.message}\n`);
-                    // Don't reject here, resolve with error info like exec did
+                    clearTimeout(timeoutId);
+                    process.stderr.write(`CODESYS spawn error (shell mode): ${error.message}\n`);
                     resolve({ code: (_a = error.errno) !== null && _a !== void 0 ? _a : 1, output: stdoutData + stderrData + `\nSpawn Error: ${error.message}` });
                 });
                 childProcess.on('close', (code) => {
-                    clearTimeout(timeoutId); // Clear timeout on successful close
+                    clearTimeout(timeoutId);
                     process.stderr.write(`CODESYS process closed with code: ${code}\n`);
                     const combinedOutput = stdoutData + stderrData;
                     resolve({ code: code, output: combinedOutput });
                 });
-                // Handle the timeout signal specifically
                 timeoutSignal.addEventListener('abort', () => {
                     process.stderr.write('Abort signal received, killing process if still running.\n');
-                    if (!childProcess.killed) {
-                        childProcess.kill('SIGTERM'); // Attempt graceful kill first
-                        // Optionally force kill after a short delay if SIGTERM doesn't work
-                        setTimeout(() => {
-                            if (!childProcess.killed) {
-                                process.stderr.write('SIGTERM ineffective, sending SIGKILL.\n');
-                                childProcess.kill('SIGKILL');
-                            }
-                        }, 2000); // 2 second grace period
-                    }
-                    // Resolve with timeout information. The 'close' event might still fire later with a specific code.
-                    // We already logged the timeout, let the 'close' handler report the final code.
-                    // If 'close' doesn't fire after kill, it might indicate a deeper issue.
-                    // We could resolve here with a timeout indicator, but letting 'close' handle it is cleaner if it works.
-                    // If 'close' never fires after abort/kill, the promise might hang. Let's add a failsafe resolve in the listener.
-                    // Revised: Resolve directly on abort to ensure promise completion.
+                    // Kill logic remains the same
+                    if (!childProcess.killed)
+                        childProcess.kill('SIGTERM');
+                    setTimeout(() => { if (!childProcess.killed)
+                        childProcess.kill('SIGKILL'); }, 2000);
                     resolve({ code: null, output: stdoutData + stderrData + "\nTIMEOUT: CODESYS process aborted due to timeout." });
-                }, { once: true }); // Ensure listener is called only once
+                }, { once: true });
             });
             output = spawnResult.output;
-            exitCode = spawnResult.code; // Can be null if process killed before exit code retrieved
-            // Determine success based on exit code and output markers
+            exitCode = spawnResult.code;
+            // Success determination logic remains the same...
+            // [...]
             if (output.includes(SCRIPT_SUCCESS_MARKER)) {
                 success = true;
             }
@@ -166,7 +146,6 @@ function executeCodesysScript(scriptContent, codesysExePath, codesysProfileName)
                 success = false;
             }
             else {
-                // Fallback logic (handle null exit code)
                 if (exitCode === 0) {
                     console.warn("Warning: CODESYS script finished with exit code 0 but no SCRIPT_SUCCESS marker found.");
                     success = !output.includes(SCRIPT_ERROR_MARKER); // Assume success if exit code 0 and no error marker
@@ -174,37 +153,37 @@ function executeCodesysScript(scriptContent, codesysExePath, codesysProfileName)
                 else {
                     success = false;
                     const exitMsg = exitCode !== null ? `exit code ${exitCode}` : 'signal or unknown reason';
+                    // Prepend error marker if not already present from script/stderr
                     if (!output.includes(SCRIPT_ERROR_MARKER)) {
-                        output += `\nSCRIPT_ERROR: Process exited with ${exitMsg}. Check CODESYS stderr output above for details.`;
+                        output = `SCRIPT_ERROR: Process exited with ${exitMsg}. Check CODESYS stderr output above for details.\n${output}`;
                     }
                     else {
-                        output += `\nSCRIPT_ERROR: Process exited with ${exitMsg}.`;
-                    }
-                    // Add timeout message specifically if that was the cause
-                    if (output.includes("TIMEOUT: CODESYS process aborted")) {
-                        // Message already added by the abort handler
+                        // Potentially add exit code info if not already part of the error marker message
+                        if (!output.includes(`exited with ${exitMsg}`)) {
+                            output += `\n(Process exited with ${exitMsg})`;
+                        }
                     }
-                    else if (exitCode === null && !output.includes("Spawn Error:")) {
-                        // If exit code is null but not due to spawn error or handled timeout, add generic killed message
+                    // Handle timeout message addition if necessary (should be added by abort handler)
+                    if (exitCode === null && !output.includes("TIMEOUT:") && !output.includes("Spawn Error:")) {
                         output += `\nProcess may have been killed externally or timed out without proper exit code reporting.`;
                     }
                 }
             }
         }
         catch (error) {
-            process.stderr.write(`Error executing CODESYS script: ${error}\n`);
+            process.stderr.write(`Error during script execution setup: ${error}\n`); // Catch errors *before* spawn
             output += `\nSCRIPT_ERROR: Failed to set up script execution process. ${error.message}`;
             success = false;
         }
         finally {
-            // Clean up the temporary file
+            // Cleanup logic remains the same...
             try {
                 yield (0, promises_1.unlink)(tempFilePath);
                 process.stderr.write(`Temporary script deleted: ${tempFilePath}\n`);
             }
             catch (cleanupError) {
                 process.stderr.write(`Failed to delete temporary script file ${tempFilePath}: ${cleanupError}\n`);
-                if (success) {
+                if (success) { // Only add warning if main process didn't already fail
                     output += `\nWARNING: Failed to delete temporary script file ${tempFilePath}. ${cleanupError.message}`;
                 }
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codesys/mcp-toolkit",
-  "version": "1.0.8",
+  "version": "1.0.9",
   "main": "dist/server.js",
   "bin": "./dist/bin.js",
   "scripts": {