@codesys/mcp-toolkit 1.1.2 → 1.1.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/scriptLoader.js +158 -0
- package/dist/server.js +276 -1067
- package/docs/configuration.md +141 -119
- package/package.json +1 -1
package/dist/server.js
CHANGED
|
@@ -6,7 +6,6 @@
|
|
|
6
6
|
*
|
|
7
7
|
* IMPORTANT: This server receives configuration as parameters from bin.ts,
|
|
8
8
|
* which helps avoid issues with command-line argument passing in different execution environments.
|
|
9
|
-
* (Incorporates script templates from v1.6.9)
|
|
10
9
|
*/
|
|
11
10
|
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
12
11
|
if (k2 === undefined) k2 = k;
|
|
@@ -64,9 +63,10 @@ console.error(`>>> Initial CWD: ${process.cwd()}`);
|
|
|
64
63
|
const mcp_js_1 = require("@modelcontextprotocol/sdk/server/mcp.js");
|
|
65
64
|
const stdio_js_1 = require("@modelcontextprotocol/sdk/server/stdio.js");
|
|
66
65
|
const zod_1 = require("zod");
|
|
67
|
-
const codesys_interop_1 = require("./codesys_interop");
|
|
66
|
+
const codesys_interop_1 = require("./codesys_interop");
|
|
68
67
|
const path = __importStar(require("path"));
|
|
69
|
-
const promises_1 = require("fs/promises");
|
|
68
|
+
const promises_1 = require("fs/promises");
|
|
69
|
+
const scriptLoader_1 = require("./scriptLoader");
|
|
70
70
|
// --- Wrap server logic in an exported function ---
|
|
71
71
|
function startMcpServer(config) {
|
|
72
72
|
return __awaiter(this, void 0, void 0, function* () {
|
|
@@ -80,16 +80,13 @@ function startMcpServer(config) {
|
|
|
80
80
|
console.error(`SERVER.TS: Using CODESYS Path: ${codesysExePath}`);
|
|
81
81
|
console.error(`SERVER.TS: Using CODESYS Profile: ${codesysProfileName}`);
|
|
82
82
|
// --- Sanity check - confirm the path exists if possible ---
|
|
83
|
-
// This helps catch configuration issues early and prevents runtime failures
|
|
84
83
|
console.error(`SERVER.TS: Checking existence of CODESYS executable: ${codesysExePath}`);
|
|
85
84
|
try {
|
|
86
85
|
// Using sync check here as it's part of initial setup before async operations start
|
|
87
86
|
const fsChecker = require('fs');
|
|
88
87
|
if (!fsChecker.existsSync(codesysExePath)) {
|
|
89
88
|
console.error(`SERVER.TS ERROR: Determined CODESYS executable path does not exist: ${codesysExePath}`);
|
|
90
|
-
// Consider throwing an error instead of exiting if bin.ts handles the catch
|
|
91
89
|
throw new Error(`CODESYS executable not found at specified path: ${codesysExePath}`);
|
|
92
|
-
// process.exit(1); // Avoid process.exit inside library functions if possible
|
|
93
90
|
}
|
|
94
91
|
else {
|
|
95
92
|
console.error(`SERVER.TS: Confirmed CODESYS executable exists.`);
|
|
@@ -98,7 +95,6 @@ function startMcpServer(config) {
|
|
|
98
95
|
catch (err) {
|
|
99
96
|
console.error(`SERVER.TS ERROR: Error checking CODESYS path existence: ${err.message}`);
|
|
100
97
|
throw err; // Rethrow the error to be caught by the caller (bin.ts)
|
|
101
|
-
// process.exit(1);
|
|
102
98
|
}
|
|
103
99
|
// --- End Configuration Handling ---
|
|
104
100
|
// --- Helper Function (fileExists - async version) ---
|
|
@@ -117,910 +113,27 @@ function startMcpServer(config) {
|
|
|
117
113
|
});
|
|
118
114
|
}
|
|
119
115
|
// --- End Helper Function ---
|
|
116
|
+
// --- Preload script templates ---
|
|
117
|
+
try {
|
|
118
|
+
yield (0, scriptLoader_1.preloadAllScriptTemplates)();
|
|
119
|
+
}
|
|
120
|
+
catch (err) {
|
|
121
|
+
console.error(`SERVER.TS ERROR: Error preloading script templates: ${err.message}`);
|
|
122
|
+
// Continue execution, as script templates will be loaded on demand as needed
|
|
123
|
+
}
|
|
120
124
|
// --- MCP Server Initialization ---
|
|
121
125
|
console.error("SERVER.TS: Initializing McpServer...");
|
|
122
126
|
const server = new mcp_js_1.McpServer({
|
|
123
127
|
name: "CODESYS Control MCP Server",
|
|
124
|
-
version: "1.
|
|
125
|
-
capabilities: {
|
|
128
|
+
version: "1.8.0", // Updated version for refactored code
|
|
129
|
+
capabilities: {
|
|
130
|
+
resources: { listChanged: true },
|
|
131
|
+
tools: { listChanged: true }
|
|
132
|
+
}
|
|
126
133
|
});
|
|
127
134
|
console.error("SERVER.TS: McpServer instance created.");
|
|
128
135
|
// --- End MCP Server Initialization ---
|
|
129
|
-
// ---
|
|
130
|
-
const ENSURE_PROJECT_OPEN_PYTHON_SNIPPET = `
|
|
131
|
-
import sys
|
|
132
|
-
import scriptengine as script_engine
|
|
133
|
-
import os
|
|
134
|
-
import time
|
|
135
|
-
import traceback
|
|
136
|
-
|
|
137
|
-
# --- Function to ensure the correct project is open ---
|
|
138
|
-
MAX_RETRIES = 3
|
|
139
|
-
RETRY_DELAY = 2.0 # seconds (use float for time.sleep)
|
|
140
|
-
|
|
141
|
-
def ensure_project_open(target_project_path):
|
|
142
|
-
print("DEBUG: Ensuring project is open: %s" % target_project_path)
|
|
143
|
-
# Normalize target path once
|
|
144
|
-
normalized_target_path = os.path.normcase(os.path.abspath(target_project_path))
|
|
145
|
-
|
|
146
|
-
for attempt in range(MAX_RETRIES):
|
|
147
|
-
print("DEBUG: Ensure project attempt %d/%d for %s" % (attempt + 1, MAX_RETRIES, normalized_target_path))
|
|
148
|
-
primary_project = None
|
|
149
|
-
try:
|
|
150
|
-
# Getting primary project might fail if CODESYS instance is unstable
|
|
151
|
-
primary_project = script_engine.projects.primary
|
|
152
|
-
except Exception as primary_err:
|
|
153
|
-
print("WARN: Error getting primary project: %s. Assuming none." % primary_err)
|
|
154
|
-
# traceback.print_exc() # Optional: Print stack trace for this error
|
|
155
|
-
primary_project = None
|
|
156
|
-
|
|
157
|
-
current_project_path = ""
|
|
158
|
-
project_ok = False # Flag to check if target is confirmed primary and accessible
|
|
159
|
-
|
|
160
|
-
if primary_project:
|
|
161
|
-
try:
|
|
162
|
-
# Getting path should be relatively safe if primary_project object exists
|
|
163
|
-
current_project_path = os.path.normcase(os.path.abspath(primary_project.path))
|
|
164
|
-
print("DEBUG: Current primary project path: %s" % current_project_path)
|
|
165
|
-
if current_project_path == normalized_target_path:
|
|
166
|
-
# Found the right project as primary, now check if it's usable
|
|
167
|
-
print("DEBUG: Target project path matches primary. Checking access...")
|
|
168
|
-
try:
|
|
169
|
-
# Try a relatively safe operation to confirm object usability
|
|
170
|
-
# Getting children count is a reasonable check
|
|
171
|
-
_ = len(primary_project.get_children(False))
|
|
172
|
-
print("DEBUG: Target project '%s' is primary and accessible." % target_project_path)
|
|
173
|
-
project_ok = True
|
|
174
|
-
return primary_project # SUCCESS CASE 1: Already open and accessible
|
|
175
|
-
except Exception as access_err:
|
|
176
|
-
# Project found, but accessing it failed. Might be unstable.
|
|
177
|
-
print("WARN: Primary project access check failed for '%s': %s. Will attempt reopen." % (current_project_path, access_err))
|
|
178
|
-
# traceback.print_exc() # Optional: Print stack trace
|
|
179
|
-
primary_project = None # Force reopen by falling through
|
|
180
|
-
else:
|
|
181
|
-
# A *different* project is primary
|
|
182
|
-
print("DEBUG: Primary project is '%s', not the target '%s'." % (current_project_path, normalized_target_path))
|
|
183
|
-
# Consider closing the wrong project if causing issues, but for now, just open target
|
|
184
|
-
# try:
|
|
185
|
-
# print("DEBUG: Closing incorrect primary project '%s'..." % current_project_path)
|
|
186
|
-
# primary_project.close() # Be careful with unsaved changes
|
|
187
|
-
# except Exception as close_err:
|
|
188
|
-
# print("WARN: Failed to close incorrect primary project: %s" % close_err)
|
|
189
|
-
primary_project = None # Force open target project
|
|
190
|
-
|
|
191
|
-
except Exception as path_err:
|
|
192
|
-
# Failed even to get the path of the supposed primary project
|
|
193
|
-
print("WARN: Could not get path of current primary project: %s. Assuming not the target." % path_err)
|
|
194
|
-
# traceback.print_exc() # Optional: Print stack trace
|
|
195
|
-
primary_project = None # Force open target project
|
|
196
|
-
|
|
197
|
-
# If target project not confirmed as primary and accessible, attempt to open/reopen
|
|
198
|
-
if not project_ok:
|
|
199
|
-
# Log clearly whether we are opening initially or reopening
|
|
200
|
-
if primary_project is None and current_project_path == "":
|
|
201
|
-
print("DEBUG: No primary project detected. Attempting to open target: %s" % target_project_path)
|
|
202
|
-
elif primary_project is None and current_project_path != "":
|
|
203
|
-
print("DEBUG: Primary project was '%s' but failed access check or needed close. Attempting to open target: %s" % (current_project_path, target_project_path))
|
|
204
|
-
else: # Includes cases where wrong project was open
|
|
205
|
-
print("DEBUG: Target project not primary or initial check failed. Attempting to open/reopen: %s" % target_project_path)
|
|
206
|
-
|
|
207
|
-
try:
|
|
208
|
-
# Set flags for silent opening, handle potential attribute errors
|
|
209
|
-
update_mode = script_engine.VersionUpdateFlags.NoUpdates | script_engine.VersionUpdateFlags.SilentMode
|
|
210
|
-
# try:
|
|
211
|
-
# update_mode = script_engine.VersionUpdateFlags.NoUpdates | script_engine.VersionUpdateFlags.SilentMode
|
|
212
|
-
# except AttributeError:
|
|
213
|
-
# print("WARN: VersionUpdateFlags not found, using integer flags for open (1 | 2 = 3).")
|
|
214
|
-
# update_mode = 3 # 1=NoUpdates, 2=SilentMode
|
|
215
|
-
|
|
216
|
-
opened_project = None
|
|
217
|
-
try:
|
|
218
|
-
# The actual open call
|
|
219
|
-
print("DEBUG: Calling script_engine.projects.open('%s', update_flags=%s)..." % (target_project_path, update_mode))
|
|
220
|
-
opened_project = script_engine.projects.open(target_project_path, update_flags=update_mode)
|
|
221
|
-
|
|
222
|
-
if not opened_project:
|
|
223
|
-
# This is a critical failure if open returns None without exception
|
|
224
|
-
print("ERROR: projects.open returned None for %s on attempt %d" % (target_project_path, attempt + 1))
|
|
225
|
-
# Allow retry loop to continue
|
|
226
|
-
else:
|
|
227
|
-
# Open call returned *something*, let's verify
|
|
228
|
-
print("DEBUG: projects.open call returned an object for: %s" % target_project_path)
|
|
229
|
-
print("DEBUG: Pausing for stabilization after open...")
|
|
230
|
-
time.sleep(RETRY_DELAY) # Give CODESYS time
|
|
231
|
-
# Re-verify: Is the project now primary and accessible?
|
|
232
|
-
recheck_primary = None
|
|
233
|
-
try: recheck_primary = script_engine.projects.primary
|
|
234
|
-
except Exception as recheck_primary_err: print("WARN: Error getting primary project after reopen: %s" % recheck_primary_err)
|
|
235
|
-
|
|
236
|
-
if recheck_primary:
|
|
237
|
-
recheck_path = ""
|
|
238
|
-
try: # Getting path might fail
|
|
239
|
-
recheck_path = os.path.normcase(os.path.abspath(recheck_primary.path))
|
|
240
|
-
except Exception as recheck_path_err:
|
|
241
|
-
print("WARN: Failed to get path after reopen: %s" % recheck_path_err)
|
|
242
|
-
|
|
243
|
-
if recheck_path == normalized_target_path:
|
|
244
|
-
print("DEBUG: Target project confirmed as primary after reopening.")
|
|
245
|
-
try: # Final sanity check
|
|
246
|
-
_ = len(recheck_primary.get_children(False))
|
|
247
|
-
print("DEBUG: Reopened project basic access confirmed.")
|
|
248
|
-
return recheck_primary # SUCCESS CASE 2: Successfully opened/reopened
|
|
249
|
-
except Exception as access_err_reopen:
|
|
250
|
-
print("WARN: Reopened project (%s) basic access check failed: %s." % (normalized_target_path, access_err_reopen))
|
|
251
|
-
# traceback.print_exc() # Optional
|
|
252
|
-
# Allow retry loop to continue
|
|
253
|
-
else:
|
|
254
|
-
print("WARN: Different project is primary after reopening! Expected '%s', got '%s'." % (normalized_target_path, recheck_path))
|
|
255
|
-
# Allow retry loop to continue, maybe it fixes itself
|
|
256
|
-
else:
|
|
257
|
-
print("WARN: No primary project found after reopening attempt %d!" % (attempt+1))
|
|
258
|
-
# Allow retry loop to continue
|
|
259
|
-
|
|
260
|
-
except Exception as open_err:
|
|
261
|
-
# Catch errors during the open call itself
|
|
262
|
-
print("ERROR: Exception during projects.open call on attempt %d: %s" % (attempt + 1, open_err))
|
|
263
|
-
traceback.print_exc() # Crucial for diagnosing open failures
|
|
264
|
-
# Allow retry loop to continue
|
|
265
|
-
|
|
266
|
-
except Exception as outer_open_err:
|
|
267
|
-
# Catch errors in the flag setup etc.
|
|
268
|
-
print("ERROR: Unexpected error during open setup/logic attempt %d: %s" % (attempt + 1, outer_open_err))
|
|
269
|
-
traceback.print_exc()
|
|
270
|
-
|
|
271
|
-
# If we didn't return successfully in this attempt, wait before retrying
|
|
272
|
-
if attempt < MAX_RETRIES - 1:
|
|
273
|
-
print("DEBUG: Ensure project attempt %d did not succeed. Waiting %f seconds..." % (attempt + 1, RETRY_DELAY))
|
|
274
|
-
time.sleep(RETRY_DELAY)
|
|
275
|
-
else: # Last attempt failed
|
|
276
|
-
print("ERROR: Failed all ensure_project_open attempts for %s." % normalized_target_path)
|
|
277
|
-
|
|
278
|
-
|
|
279
|
-
# If all retries fail after the loop
|
|
280
|
-
raise RuntimeError("Failed to ensure project '%s' is open and accessible after %d attempts." % (target_project_path, MAX_RETRIES))
|
|
281
|
-
# --- End of function ---
|
|
282
|
-
|
|
283
|
-
# Placeholder for the project file path (must be set in scripts using this snippet)
|
|
284
|
-
PROJECT_FILE_PATH = r"{PROJECT_FILE_PATH}"
|
|
285
|
-
`;
|
|
286
|
-
const CHECK_STATUS_SCRIPT = `
|
|
287
|
-
import sys, scriptengine as script_engine, os, traceback
|
|
288
|
-
project_open = False; project_name = "No project open"; project_path = "N/A"; scripting_ok = False
|
|
289
|
-
try:
|
|
290
|
-
scripting_ok = True; primary_project = script_engine.projects.primary
|
|
291
|
-
if primary_project:
|
|
292
|
-
project_open = True
|
|
293
|
-
try:
|
|
294
|
-
project_path = os.path.normcase(os.path.abspath(primary_project.path))
|
|
295
|
-
try:
|
|
296
|
-
project_name = primary_project.get_name() # Might fail
|
|
297
|
-
if not project_name: project_name = "Unnamed (path: %s)" % os.path.basename(project_path)
|
|
298
|
-
except: project_name = "Unnamed (path: %s)" % os.path.basename(project_path)
|
|
299
|
-
except Exception as e_path: project_path = "N/A (Error: %s)" % e_path; project_name = "Unnamed (Path Error)"
|
|
300
|
-
print("Project Open: %s" % project_open); print("Project Name: %s" % project_name)
|
|
301
|
-
print("Project Path: %s" % project_path); print("Scripting OK: %s" % scripting_ok)
|
|
302
|
-
print("SCRIPT_SUCCESS: Status check complete."); sys.exit(0)
|
|
303
|
-
except Exception as e:
|
|
304
|
-
error_message = "Error during status check: %s" % e
|
|
305
|
-
print(error_message); print("Scripting OK: False")
|
|
306
|
-
# traceback.print_exc() # Optional traceback
|
|
307
|
-
print("SCRIPT_ERROR: %s" % error_message); sys.exit(1)
|
|
308
|
-
`;
|
|
309
|
-
const OPEN_PROJECT_SCRIPT_TEMPLATE = `
|
|
310
|
-
import sys, scriptengine as script_engine, os, traceback
|
|
311
|
-
${ENSURE_PROJECT_OPEN_PYTHON_SNIPPET}
|
|
312
|
-
try:
|
|
313
|
-
project = ensure_project_open(PROJECT_FILE_PATH)
|
|
314
|
-
# Get name from object if possible, otherwise use path basename
|
|
315
|
-
proj_name = "Unknown"
|
|
316
|
-
try:
|
|
317
|
-
if project: proj_name = project.get_name() or os.path.basename(PROJECT_FILE_PATH)
|
|
318
|
-
else: proj_name = os.path.basename(PROJECT_FILE_PATH) + " (ensure_project_open returned None?)"
|
|
319
|
-
except Exception:
|
|
320
|
-
proj_name = os.path.basename(PROJECT_FILE_PATH) + " (name retrieval failed)"
|
|
321
|
-
print("Project Opened: %s" % proj_name)
|
|
322
|
-
print("SCRIPT_SUCCESS: Project opened successfully.")
|
|
323
|
-
sys.exit(0)
|
|
324
|
-
except Exception as e:
|
|
325
|
-
error_message = "Error opening project %s: %s" % (PROJECT_FILE_PATH, e)
|
|
326
|
-
print(error_message)
|
|
327
|
-
traceback.print_exc()
|
|
328
|
-
print("SCRIPT_ERROR: %s" % error_message); sys.exit(1)
|
|
329
|
-
`;
|
|
330
|
-
const CREATE_PROJECT_SCRIPT_TEMPLATE = `
|
|
331
|
-
import sys, scriptengine as script_engine, os, shutil, time, traceback
|
|
332
|
-
# Placeholders
|
|
333
|
-
TEMPLATE_PROJECT_PATH = r'{TEMPLATE_PROJECT_PATH}' # Path to Standard.project
|
|
334
|
-
PROJECT_FILE_PATH = r'{PROJECT_FILE_PATH}' # Path for the new project (Target Path)
|
|
335
|
-
try:
|
|
336
|
-
print("DEBUG: Python script create_project (copy from template):")
|
|
337
|
-
print("DEBUG: Template Source = %s" % TEMPLATE_PROJECT_PATH)
|
|
338
|
-
print("DEBUG: Target Path = %s" % PROJECT_FILE_PATH)
|
|
339
|
-
if not PROJECT_FILE_PATH: raise ValueError("Target project file path empty.")
|
|
340
|
-
if not TEMPLATE_PROJECT_PATH: raise ValueError("Template project file path empty.")
|
|
341
|
-
if not os.path.exists(TEMPLATE_PROJECT_PATH): raise IOError("Template project file not found: %s" % TEMPLATE_PROJECT_PATH)
|
|
342
|
-
|
|
343
|
-
# 1. Copy the template project file to the new location
|
|
344
|
-
target_dir = os.path.dirname(PROJECT_FILE_PATH)
|
|
345
|
-
if not os.path.exists(target_dir): print("DEBUG: Creating target directory: %s" % target_dir); os.makedirs(target_dir)
|
|
346
|
-
# Check if target file already exists
|
|
347
|
-
if os.path.exists(PROJECT_FILE_PATH): print("WARN: Target project file already exists, overwriting: %s" % PROJECT_FILE_PATH)
|
|
348
|
-
|
|
349
|
-
print("DEBUG: Copying '%s' to '%s'..." % (TEMPLATE_PROJECT_PATH, PROJECT_FILE_PATH))
|
|
350
|
-
shutil.copy2(TEMPLATE_PROJECT_PATH, PROJECT_FILE_PATH) # copy2 preserves metadata
|
|
351
|
-
print("DEBUG: File copy complete.")
|
|
352
|
-
|
|
353
|
-
# 2. Open the newly copied project file
|
|
354
|
-
print("DEBUG: Opening the copied project: %s" % PROJECT_FILE_PATH)
|
|
355
|
-
# Set flags for silent opening
|
|
356
|
-
update_mode = script_engine.VersionUpdateFlags.NoUpdates | script_engine.VersionUpdateFlags.SilentMode
|
|
357
|
-
# try:
|
|
358
|
-
# update_mode = script_engine.VersionUpdateFlags.NoUpdates | script_engine.VersionUpdateFlags.SilentMode
|
|
359
|
-
# except AttributeError:
|
|
360
|
-
# print("WARN: VersionUpdateFlags not found, using integer flags for open (1 | 2 = 3).")
|
|
361
|
-
# update_mode = 3
|
|
362
|
-
|
|
363
|
-
project = script_engine.projects.open(PROJECT_FILE_PATH, update_flags=update_mode)
|
|
364
|
-
print("DEBUG: script_engine.projects.open returned: %s" % project)
|
|
365
|
-
if project:
|
|
366
|
-
print("DEBUG: Pausing briefly after open...")
|
|
367
|
-
time.sleep(1.0) # Allow CODESYS to potentially initialize things
|
|
368
|
-
try:
|
|
369
|
-
print("DEBUG: Explicitly saving project after opening copy...")
|
|
370
|
-
project.save();
|
|
371
|
-
print("DEBUG: Project save after opening copy succeeded.")
|
|
372
|
-
except Exception as save_err:
|
|
373
|
-
print("WARN: Explicit save after opening copy failed: %s" % save_err)
|
|
374
|
-
# Decide if this is critical - maybe not, but good to know.
|
|
375
|
-
print("Project Created from Template Copy at: %s" % PROJECT_FILE_PATH)
|
|
376
|
-
print("SCRIPT_SUCCESS: Project copied from template and opened successfully.")
|
|
377
|
-
sys.exit(0)
|
|
378
|
-
else:
|
|
379
|
-
error_message = "Failed to open project copy %s after copying template %s. projects.open returned None." % (PROJECT_FILE_PATH, TEMPLATE_PROJECT_PATH)
|
|
380
|
-
print(error_message); print("SCRIPT_ERROR: %s" % error_message); sys.exit(1)
|
|
381
|
-
except Exception as e:
|
|
382
|
-
detailed_error = traceback.format_exc()
|
|
383
|
-
error_message = "Error creating project '%s' from template '%s': %s\\n%s" % (PROJECT_FILE_PATH, TEMPLATE_PROJECT_PATH, e, detailed_error)
|
|
384
|
-
print(error_message); print("SCRIPT_ERROR: Error copying/opening template: %s" % e); sys.exit(1)
|
|
385
|
-
`;
|
|
386
|
-
const SAVE_PROJECT_SCRIPT_TEMPLATE = `
|
|
387
|
-
import sys, scriptengine as script_engine, os, traceback
|
|
388
|
-
${ENSURE_PROJECT_OPEN_PYTHON_SNIPPET}
|
|
389
|
-
try:
|
|
390
|
-
primary_project = ensure_project_open(PROJECT_FILE_PATH)
|
|
391
|
-
# Get name from object if possible, otherwise use path basename
|
|
392
|
-
project_name = "Unknown"
|
|
393
|
-
try:
|
|
394
|
-
if primary_project: project_name = primary_project.get_name() or os.path.basename(PROJECT_FILE_PATH)
|
|
395
|
-
else: project_name = os.path.basename(PROJECT_FILE_PATH) + " (ensure_project_open returned None?)"
|
|
396
|
-
except Exception:
|
|
397
|
-
project_name = os.path.basename(PROJECT_FILE_PATH) + " (name retrieval failed)"
|
|
398
|
-
|
|
399
|
-
print("DEBUG: Saving project: %s (%s)" % (project_name, PROJECT_FILE_PATH))
|
|
400
|
-
primary_project.save()
|
|
401
|
-
print("DEBUG: project.save() executed.")
|
|
402
|
-
print("Project Saved: %s" % project_name)
|
|
403
|
-
print("SCRIPT_SUCCESS: Project saved successfully.")
|
|
404
|
-
sys.exit(0)
|
|
405
|
-
except Exception as e:
|
|
406
|
-
error_message = "Error saving project %s: %s" % (PROJECT_FILE_PATH, e)
|
|
407
|
-
print(error_message)
|
|
408
|
-
traceback.print_exc()
|
|
409
|
-
print("SCRIPT_ERROR: %s" % error_message); sys.exit(1)
|
|
410
|
-
`;
|
|
411
|
-
const FIND_OBJECT_BY_PATH_PYTHON_SNIPPET = `
|
|
412
|
-
import traceback
|
|
413
|
-
# --- Find object by path function ---
|
|
414
|
-
def find_object_by_path_robust(start_node, full_path, target_type_name="object"):
|
|
415
|
-
print("DEBUG: Finding %s by path: '%s'" % (target_type_name, full_path))
|
|
416
|
-
normalized_path = full_path.replace('\\\\', '/').strip('/')
|
|
417
|
-
path_parts = normalized_path.split('/')
|
|
418
|
-
if not path_parts:
|
|
419
|
-
print("ERROR: Path is empty.")
|
|
420
|
-
return None
|
|
421
|
-
|
|
422
|
-
# Determine the actual starting node (project or application)
|
|
423
|
-
project = start_node # Assume start_node is project initially
|
|
424
|
-
if not hasattr(start_node, 'active_application') and hasattr(start_node, 'project'):
|
|
425
|
-
# If start_node is not project but has project ref (e.g., an application), get the project
|
|
426
|
-
try: project = start_node.project
|
|
427
|
-
except Exception as proj_ref_err:
|
|
428
|
-
print("WARN: Could not get project reference from start_node: %s" % proj_ref_err)
|
|
429
|
-
# Proceed assuming start_node might be the project anyway or search fails
|
|
430
|
-
|
|
431
|
-
# Try to get the application object robustly if we think we have the project
|
|
432
|
-
app = None
|
|
433
|
-
if hasattr(project, 'active_application'):
|
|
434
|
-
try: app = project.active_application
|
|
435
|
-
except Exception: pass # Ignore errors getting active app
|
|
436
|
-
if not app:
|
|
437
|
-
try:
|
|
438
|
-
apps = project.find("Application", True) # Search recursively
|
|
439
|
-
if apps: app = apps[0]
|
|
440
|
-
except Exception: pass
|
|
441
|
-
|
|
442
|
-
# Check if the first path part matches the application name
|
|
443
|
-
app_name_lower = ""
|
|
444
|
-
if app:
|
|
445
|
-
try: app_name_lower = (app.get_name() or "application").lower()
|
|
446
|
-
except Exception: app_name_lower = "application" # Fallback
|
|
447
|
-
|
|
448
|
-
# Decide where to start the traversal
|
|
449
|
-
current_obj = start_node # Default to the node passed in
|
|
450
|
-
if hasattr(project, 'active_application'): # Only adjust if start_node was likely the project
|
|
451
|
-
if app and path_parts[0].lower() == app_name_lower:
|
|
452
|
-
print("DEBUG: Path starts with Application name '%s'. Beginning search there." % path_parts[0])
|
|
453
|
-
current_obj = app
|
|
454
|
-
path_parts = path_parts[1:] # Consume the app name part
|
|
455
|
-
# If path was *only* the application name
|
|
456
|
-
if not path_parts:
|
|
457
|
-
print("DEBUG: Target path is the Application object itself.")
|
|
458
|
-
return current_obj
|
|
459
|
-
else:
|
|
460
|
-
print("DEBUG: Path does not start with Application name. Starting search from project root.")
|
|
461
|
-
current_obj = project # Start search from the project root
|
|
462
|
-
else:
|
|
463
|
-
print("DEBUG: Starting search from originally provided node.")
|
|
464
|
-
|
|
465
|
-
|
|
466
|
-
# Traverse the remaining path parts
|
|
467
|
-
parent_path_str = getattr(current_obj, 'get_name', lambda: str(current_obj))() # Safer name getting
|
|
468
|
-
|
|
469
|
-
for i, part_name in enumerate(path_parts):
|
|
470
|
-
is_last_part = (i == len(path_parts) - 1)
|
|
471
|
-
print("DEBUG: Searching for part [%d/%d]: '%s' under '%s'" % (i+1, len(path_parts), part_name, parent_path_str))
|
|
472
|
-
found_in_parent = None
|
|
473
|
-
try:
|
|
474
|
-
# Prioritize non-recursive find for direct children
|
|
475
|
-
children_of_current = current_obj.get_children(False)
|
|
476
|
-
print("DEBUG: Found %d direct children under '%s'." % (len(children_of_current), parent_path_str))
|
|
477
|
-
for child in children_of_current:
|
|
478
|
-
child_name = getattr(child, 'get_name', lambda: None)() # Safer name getting
|
|
479
|
-
# print("DEBUG: Checking child: '%s'" % child_name) # Verbose
|
|
480
|
-
if child_name == part_name:
|
|
481
|
-
found_in_parent = child
|
|
482
|
-
print("DEBUG: Found direct child matching '%s'." % part_name)
|
|
483
|
-
break # Found direct child, stop searching children
|
|
484
|
-
|
|
485
|
-
# If not found directly, AND it's the last part, try recursive find from current parent
|
|
486
|
-
if not found_in_parent and is_last_part:
|
|
487
|
-
print("DEBUG: Direct find failed for last part '%s'. Trying recursive find under '%s'." % (part_name, parent_path_str))
|
|
488
|
-
found_recursive_list = current_obj.find(part_name, True) # Recursive find
|
|
489
|
-
if found_recursive_list:
|
|
490
|
-
# Maybe add a check here if multiple are found?
|
|
491
|
-
found_in_parent = found_recursive_list[0] # Take the first match
|
|
492
|
-
print("DEBUG: Found last part '%s' recursively." % part_name)
|
|
493
|
-
else:
|
|
494
|
-
print("DEBUG: Recursive find also failed for last part '%s'." % part_name)
|
|
495
|
-
|
|
496
|
-
# Update current object if found
|
|
497
|
-
if found_in_parent:
|
|
498
|
-
current_obj = found_in_parent
|
|
499
|
-
parent_path_str = getattr(current_obj, 'get_name', lambda: part_name)() # Safer name getting
|
|
500
|
-
print("DEBUG: Stepped into '%s'." % parent_path_str)
|
|
501
|
-
else:
|
|
502
|
-
# If not found at any point, the path is invalid from this parent
|
|
503
|
-
print("ERROR: Path part '%s' not found under '%s'." % (part_name, parent_path_str))
|
|
504
|
-
return None # Path broken
|
|
505
|
-
|
|
506
|
-
except Exception as find_err:
|
|
507
|
-
print("ERROR: Exception while searching for '%s' under '%s': %s" % (part_name, parent_path_str, find_err))
|
|
508
|
-
traceback.print_exc()
|
|
509
|
-
return None # Error during search
|
|
510
|
-
|
|
511
|
-
# Final verification (optional but recommended): Check if the found object's name matches the last part
|
|
512
|
-
final_expected_name = full_path.split('/')[-1]
|
|
513
|
-
found_final_name = getattr(current_obj, 'get_name', lambda: None)() # Safer name getting
|
|
514
|
-
|
|
515
|
-
if found_final_name == final_expected_name:
|
|
516
|
-
print("DEBUG: Final %s found and name verified for path '%s': %s" % (target_type_name, full_path, found_final_name))
|
|
517
|
-
return current_obj
|
|
518
|
-
else:
|
|
519
|
-
print("ERROR: Traversal ended on object '%s' but expected final name was '%s'." % (found_final_name, final_expected_name))
|
|
520
|
-
return None # Name mismatch implies target not found as expected
|
|
521
|
-
|
|
522
|
-
# --- End of find object function ---
|
|
523
|
-
`;
|
|
524
|
-
const CREATE_POU_SCRIPT_TEMPLATE = `
|
|
525
|
-
import sys, scriptengine as script_engine, os, traceback
|
|
526
|
-
${ENSURE_PROJECT_OPEN_PYTHON_SNIPPET}
|
|
527
|
-
${FIND_OBJECT_BY_PATH_PYTHON_SNIPPET}
|
|
528
|
-
POU_NAME = "{POU_NAME}"; POU_TYPE_STR = "{POU_TYPE_STR}"; IMPL_LANGUAGE_STR = "{IMPL_LANGUAGE_STR}"; PARENT_PATH_REL = "{PARENT_PATH}"
|
|
529
|
-
pou_type_map = { "Program": script_engine.PouType.Program, "FunctionBlock": script_engine.PouType.FunctionBlock, "Function": script_engine.PouType.Function }
|
|
530
|
-
# Map common language names to ImplementationLanguages attributes if needed (optional, None usually works)
|
|
531
|
-
# lang_map = { "ST": script_engine.ImplementationLanguage.st, ... }
|
|
532
|
-
|
|
533
|
-
try:
|
|
534
|
-
print("DEBUG: create_pou script: Name='%s', Type='%s', Lang='%s', ParentPath='%s', Project='%s'" % (POU_NAME, POU_TYPE_STR, IMPL_LANGUAGE_STR, PARENT_PATH_REL, PROJECT_FILE_PATH))
|
|
535
|
-
primary_project = ensure_project_open(PROJECT_FILE_PATH)
|
|
536
|
-
if not POU_NAME: raise ValueError("POU name empty.")
|
|
537
|
-
if not PARENT_PATH_REL: raise ValueError("Parent path empty.")
|
|
538
|
-
|
|
539
|
-
# Resolve POU Type Enum
|
|
540
|
-
pou_type_enum = pou_type_map.get(POU_TYPE_STR)
|
|
541
|
-
if not pou_type_enum: raise ValueError("Invalid POU type string: %s. Use Program, FunctionBlock, or Function." % POU_TYPE_STR)
|
|
542
|
-
|
|
543
|
-
# Find parent object using the robust function
|
|
544
|
-
parent_object = find_object_by_path_robust(primary_project, PARENT_PATH_REL, "parent container")
|
|
545
|
-
if not parent_object: raise ValueError("Parent object not found for path: %s" % PARENT_PATH_REL)
|
|
546
|
-
|
|
547
|
-
parent_name = getattr(parent_object, 'get_name', lambda: str(parent_object))()
|
|
548
|
-
print("DEBUG: Using parent object: %s (Type: %s)" % (parent_name, type(parent_object).__name__))
|
|
549
|
-
|
|
550
|
-
# Check if parent object supports creating POUs (should implement ScriptIecLanguageObjectContainer)
|
|
551
|
-
if not hasattr(parent_object, 'create_pou'):
|
|
552
|
-
raise TypeError("Parent object '%s' of type %s does not support create_pou." % (parent_name, type(parent_object).__name__))
|
|
553
|
-
|
|
554
|
-
# Set language GUID to None (let CODESYS default based on parent/settings)
|
|
555
|
-
lang_guid = None
|
|
556
|
-
print("DEBUG: Setting language to None (will use default).")
|
|
557
|
-
# Example if mapping language string: lang_guid = lang_map.get(IMPL_LANGUAGE_STR, None)
|
|
558
|
-
|
|
559
|
-
print("DEBUG: Calling parent_object.create_pou: Name='%s', Type=%s, Lang=%s" % (POU_NAME, pou_type_enum, lang_guid))
|
|
560
|
-
|
|
561
|
-
# Call create_pou using keyword arguments
|
|
562
|
-
new_pou = parent_object.create_pou(
|
|
563
|
-
name=POU_NAME,
|
|
564
|
-
type=pou_type_enum,
|
|
565
|
-
language=lang_guid # Pass None
|
|
566
|
-
)
|
|
567
|
-
|
|
568
|
-
print("DEBUG: parent_object.create_pou returned: %s" % new_pou)
|
|
569
|
-
if new_pou:
|
|
570
|
-
new_pou_name = getattr(new_pou, 'get_name', lambda: POU_NAME)()
|
|
571
|
-
print("DEBUG: POU object created: %s" % new_pou_name)
|
|
572
|
-
|
|
573
|
-
# --- SAVE THE PROJECT TO PERSIST THE NEW POU ---
|
|
574
|
-
try:
|
|
575
|
-
print("DEBUG: Saving Project...")
|
|
576
|
-
primary_project.save() # Save the overall project file
|
|
577
|
-
print("DEBUG: Project saved successfully after POU creation.")
|
|
578
|
-
except Exception as save_err:
|
|
579
|
-
print("ERROR: Failed to save Project after POU creation: %s" % save_err)
|
|
580
|
-
detailed_error = traceback.format_exc()
|
|
581
|
-
error_message = "Error saving Project after creating POU '%s': %s\\n%s" % (new_pou_name, save_err, detailed_error)
|
|
582
|
-
print(error_message); print("SCRIPT_ERROR: %s" % error_message); sys.exit(1)
|
|
583
|
-
# --- END SAVING ---
|
|
584
|
-
|
|
585
|
-
print("POU Created: %s" % new_pou_name); print("Type: %s" % POU_TYPE_STR); print("Language: %s (Defaulted)" % IMPL_LANGUAGE_STR); print("Parent Path: %s" % PARENT_PATH_REL)
|
|
586
|
-
print("SCRIPT_SUCCESS: POU created successfully."); sys.exit(0)
|
|
587
|
-
else:
|
|
588
|
-
error_message = "Failed to create POU '%s'. create_pou returned None." % POU_NAME; print(error_message); print("SCRIPT_ERROR: %s" % error_message); sys.exit(1)
|
|
589
|
-
except Exception as e:
|
|
590
|
-
detailed_error = traceback.format_exc()
|
|
591
|
-
error_message = "Error creating POU '%s' in project '%s': %s\\n%s" % (POU_NAME, PROJECT_FILE_PATH, e, detailed_error)
|
|
592
|
-
print(error_message); print("SCRIPT_ERROR: Error creating POU '%s': %s" % (POU_NAME, e)); sys.exit(1)
|
|
593
|
-
`;
|
|
594
|
-
const SET_POU_CODE_SCRIPT_TEMPLATE = `
|
|
595
|
-
import sys, scriptengine as script_engine, os, traceback
|
|
596
|
-
${ENSURE_PROJECT_OPEN_PYTHON_SNIPPET}
|
|
597
|
-
${FIND_OBJECT_BY_PATH_PYTHON_SNIPPET}
|
|
598
|
-
POU_FULL_PATH = "{POU_FULL_PATH}" # Expecting format like "Application/MyPOU" or "Folder/SubFolder/MyPOU"
|
|
599
|
-
DECLARATION_CONTENT = """{DECLARATION_CONTENT}"""
|
|
600
|
-
IMPLEMENTATION_CONTENT = """{IMPLEMENTATION_CONTENT}"""
|
|
601
|
-
|
|
602
|
-
try:
|
|
603
|
-
print("DEBUG: set_pou_code script: POU_FULL_PATH='%s', Project='%s'" % (POU_FULL_PATH, PROJECT_FILE_PATH))
|
|
604
|
-
primary_project = ensure_project_open(PROJECT_FILE_PATH)
|
|
605
|
-
if not POU_FULL_PATH: raise ValueError("POU full path empty.")
|
|
606
|
-
|
|
607
|
-
# Find the target POU/Method/Property object
|
|
608
|
-
target_object = find_object_by_path_robust(primary_project, POU_FULL_PATH, "target object")
|
|
609
|
-
if not target_object: raise ValueError("Target object not found using path: %s" % POU_FULL_PATH)
|
|
610
|
-
|
|
611
|
-
target_name = getattr(target_object, 'get_name', lambda: POU_FULL_PATH)()
|
|
612
|
-
print("DEBUG: Found target object: %s" % target_name)
|
|
613
|
-
|
|
614
|
-
# --- Set Declaration Part ---
|
|
615
|
-
declaration_updated = False
|
|
616
|
-
# Check if the content is actually provided (might be None/empty if only impl is set)
|
|
617
|
-
has_declaration_content = 'DECLARATION_CONTENT' in locals() or 'DECLARATION_CONTENT' in globals()
|
|
618
|
-
if has_declaration_content and DECLARATION_CONTENT is not None: # Check not None
|
|
619
|
-
if hasattr(target_object, 'textual_declaration'):
|
|
620
|
-
decl_obj = target_object.textual_declaration
|
|
621
|
-
if decl_obj and hasattr(decl_obj, 'replace'):
|
|
622
|
-
try:
|
|
623
|
-
print("DEBUG: Accessing textual_declaration...")
|
|
624
|
-
decl_obj.replace(DECLARATION_CONTENT)
|
|
625
|
-
print("DEBUG: Set declaration text using replace().")
|
|
626
|
-
declaration_updated = True
|
|
627
|
-
except Exception as decl_err:
|
|
628
|
-
print("ERROR: Failed to set declaration text: %s" % decl_err)
|
|
629
|
-
traceback.print_exc() # Print stack trace for detailed error
|
|
630
|
-
else:
|
|
631
|
-
print("WARN: Target '%s' textual_declaration attribute is None or does not have replace(). Skipping declaration update." % target_name)
|
|
632
|
-
else:
|
|
633
|
-
print("WARN: Target '%s' does not have textual_declaration attribute. Skipping declaration update." % target_name)
|
|
634
|
-
else:
|
|
635
|
-
print("DEBUG: Declaration content not provided or is None. Skipping declaration update.")
|
|
636
|
-
|
|
637
|
-
|
|
638
|
-
# --- Set Implementation Part ---
|
|
639
|
-
implementation_updated = False
|
|
640
|
-
has_implementation_content = 'IMPLEMENTATION_CONTENT' in locals() or 'IMPLEMENTATION_CONTENT' in globals()
|
|
641
|
-
if has_implementation_content and IMPLEMENTATION_CONTENT is not None: # Check not None
|
|
642
|
-
if hasattr(target_object, 'textual_implementation'):
|
|
643
|
-
impl_obj = target_object.textual_implementation
|
|
644
|
-
if impl_obj and hasattr(impl_obj, 'replace'):
|
|
645
|
-
try:
|
|
646
|
-
print("DEBUG: Accessing textual_implementation...")
|
|
647
|
-
impl_obj.replace(IMPLEMENTATION_CONTENT)
|
|
648
|
-
print("DEBUG: Set implementation text using replace().")
|
|
649
|
-
implementation_updated = True
|
|
650
|
-
except Exception as impl_err:
|
|
651
|
-
print("ERROR: Failed to set implementation text: %s" % impl_err)
|
|
652
|
-
traceback.print_exc() # Print stack trace for detailed error
|
|
653
|
-
else:
|
|
654
|
-
print("WARN: Target '%s' textual_implementation attribute is None or does not have replace(). Skipping implementation update." % target_name)
|
|
655
|
-
else:
|
|
656
|
-
print("WARN: Target '%s' does not have textual_implementation attribute. Skipping implementation update." % target_name)
|
|
657
|
-
else:
|
|
658
|
-
print("DEBUG: Implementation content not provided or is None. Skipping implementation update.")
|
|
659
|
-
|
|
660
|
-
|
|
661
|
-
# --- SAVE THE PROJECT TO PERSIST THE CODE CHANGE ---
|
|
662
|
-
# Only save if something was actually updated to avoid unnecessary saves
|
|
663
|
-
if declaration_updated or implementation_updated:
|
|
664
|
-
try:
|
|
665
|
-
print("DEBUG: Saving Project (after code change)...")
|
|
666
|
-
primary_project.save() # Save the overall project file
|
|
667
|
-
print("DEBUG: Project saved successfully after code change.")
|
|
668
|
-
except Exception as save_err:
|
|
669
|
-
print("ERROR: Failed to save Project after setting code: %s" % save_err)
|
|
670
|
-
detailed_error = traceback.format_exc()
|
|
671
|
-
error_message = "Error saving Project after code change for '%s': %s\\n%s" % (target_name, save_err, detailed_error)
|
|
672
|
-
print(error_message); print("SCRIPT_ERROR: %s" % error_message); sys.exit(1)
|
|
673
|
-
else:
|
|
674
|
-
print("DEBUG: No code parts were updated, skipping project save.")
|
|
675
|
-
# --- END SAVING ---
|
|
676
|
-
|
|
677
|
-
print("Code Set For: %s" % target_name)
|
|
678
|
-
print("Path: %s" % POU_FULL_PATH)
|
|
679
|
-
print("SCRIPT_SUCCESS: Declaration and/or implementation set successfully."); sys.exit(0)
|
|
680
|
-
|
|
681
|
-
except Exception as e:
|
|
682
|
-
detailed_error = traceback.format_exc()
|
|
683
|
-
error_message = "Error setting code for object '%s' in project '%s': %s\\n%s" % (POU_FULL_PATH, PROJECT_FILE_PATH, e, detailed_error)
|
|
684
|
-
print(error_message); print("SCRIPT_ERROR: %s" % error_message); sys.exit(1)
|
|
685
|
-
`;
|
|
686
|
-
const CREATE_PROPERTY_SCRIPT_TEMPLATE = `
|
|
687
|
-
import sys, scriptengine as script_engine, os, traceback
|
|
688
|
-
${ENSURE_PROJECT_OPEN_PYTHON_SNIPPET}
|
|
689
|
-
${FIND_OBJECT_BY_PATH_PYTHON_SNIPPET}
|
|
690
|
-
PARENT_POU_FULL_PATH = "{PARENT_POU_FULL_PATH}" # e.g., "Application/MyFB"
|
|
691
|
-
PROPERTY_NAME = "{PROPERTY_NAME}"
|
|
692
|
-
PROPERTY_TYPE = "{PROPERTY_TYPE}"
|
|
693
|
-
# Optional: Language for Getter/Setter (usually defaults to ST)
|
|
694
|
-
# LANG_GUID_STR = "{LANG_GUID_STR}" # Example if needed
|
|
695
|
-
|
|
696
|
-
try:
|
|
697
|
-
print("DEBUG: create_property script: ParentPOU='%s', Name='%s', Type='%s', Project='%s'" % (PARENT_POU_FULL_PATH, PROPERTY_NAME, PROPERTY_TYPE, PROJECT_FILE_PATH))
|
|
698
|
-
primary_project = ensure_project_open(PROJECT_FILE_PATH)
|
|
699
|
-
if not PARENT_POU_FULL_PATH: raise ValueError("Parent POU full path empty.")
|
|
700
|
-
if not PROPERTY_NAME: raise ValueError("Property name empty.")
|
|
701
|
-
if not PROPERTY_TYPE: raise ValueError("Property type empty.")
|
|
702
|
-
|
|
703
|
-
# Find the parent POU object
|
|
704
|
-
parent_pou_object = find_object_by_path_robust(primary_project, PARENT_POU_FULL_PATH, "parent POU")
|
|
705
|
-
if not parent_pou_object: raise ValueError("Parent POU object not found: %s" % PARENT_POU_FULL_PATH)
|
|
706
|
-
|
|
707
|
-
parent_pou_name = getattr(parent_pou_object, 'get_name', lambda: PARENT_POU_FULL_PATH)()
|
|
708
|
-
print("DEBUG: Found Parent POU object: %s" % parent_pou_name)
|
|
709
|
-
|
|
710
|
-
# Check if parent object supports creating properties (should implement ScriptIecLanguageMemberContainer)
|
|
711
|
-
if not hasattr(parent_pou_object, 'create_property'):
|
|
712
|
-
raise TypeError("Parent object '%s' of type %s does not support create_property." % (parent_pou_name, type(parent_pou_object).__name__))
|
|
713
|
-
|
|
714
|
-
# Default language to None (usually ST)
|
|
715
|
-
lang_guid = None
|
|
716
|
-
print("DEBUG: Calling create_property: Name='%s', Type='%s', Lang=%s" % (PROPERTY_NAME, PROPERTY_TYPE, lang_guid))
|
|
717
|
-
|
|
718
|
-
# Call the create_property method ON THE PARENT POU
|
|
719
|
-
new_property_object = parent_pou_object.create_property(
|
|
720
|
-
name=PROPERTY_NAME,
|
|
721
|
-
return_type=PROPERTY_TYPE,
|
|
722
|
-
language=lang_guid # Pass None to use default
|
|
723
|
-
)
|
|
724
|
-
|
|
725
|
-
if new_property_object:
|
|
726
|
-
new_prop_name = getattr(new_property_object, 'get_name', lambda: PROPERTY_NAME)()
|
|
727
|
-
print("DEBUG: Property object created: %s" % new_prop_name)
|
|
728
|
-
|
|
729
|
-
# --- SAVE THE PROJECT TO PERSIST THE NEW PROPERTY OBJECT ---
|
|
730
|
-
try:
|
|
731
|
-
print("DEBUG: Saving Project (after property creation)...")
|
|
732
|
-
primary_project.save()
|
|
733
|
-
print("DEBUG: Project saved successfully after property creation.")
|
|
734
|
-
except Exception as save_err:
|
|
735
|
-
print("ERROR: Failed to save Project after creating property: %s" % save_err)
|
|
736
|
-
detailed_error = traceback.format_exc()
|
|
737
|
-
error_message = "Error saving Project after creating property '%s': %s\\n%s" % (PROPERTY_NAME, save_err, detailed_error)
|
|
738
|
-
print(error_message); print("SCRIPT_ERROR: %s" % error_message); sys.exit(1)
|
|
739
|
-
# --- END SAVING ---
|
|
740
|
-
|
|
741
|
-
print("Property Created: %s" % new_prop_name)
|
|
742
|
-
print("Parent POU: %s" % PARENT_POU_FULL_PATH)
|
|
743
|
-
print("Type: %s" % PROPERTY_TYPE)
|
|
744
|
-
print("SCRIPT_SUCCESS: Property created successfully."); sys.exit(0)
|
|
745
|
-
else:
|
|
746
|
-
error_message = "Failed to create property '%s' under '%s'. create_property returned None." % (PROPERTY_NAME, parent_pou_name)
|
|
747
|
-
print(error_message); print("SCRIPT_ERROR: %s" % error_message); sys.exit(1)
|
|
748
|
-
|
|
749
|
-
except Exception as e:
|
|
750
|
-
detailed_error = traceback.format_exc()
|
|
751
|
-
error_message = "Error creating property '%s' under POU '%s' in project '%s': %s\\n%s" % (PROPERTY_NAME, PARENT_POU_FULL_PATH, PROJECT_FILE_PATH, e, detailed_error)
|
|
752
|
-
print(error_message); print("SCRIPT_ERROR: %s" % error_message); sys.exit(1)
|
|
753
|
-
`;
|
|
754
|
-
const CREATE_METHOD_SCRIPT_TEMPLATE = `
|
|
755
|
-
import sys, scriptengine as script_engine, os, traceback
|
|
756
|
-
${ENSURE_PROJECT_OPEN_PYTHON_SNIPPET}
|
|
757
|
-
${FIND_OBJECT_BY_PATH_PYTHON_SNIPPET}
|
|
758
|
-
PARENT_POU_FULL_PATH = "{PARENT_POU_FULL_PATH}" # e.g., "Application/MyFB"
|
|
759
|
-
METHOD_NAME = "{METHOD_NAME}"
|
|
760
|
-
RETURN_TYPE = "{RETURN_TYPE}" # Can be empty string for no return type
|
|
761
|
-
# Optional: Language
|
|
762
|
-
# LANG_GUID_STR = "{LANG_GUID_STR}" # Example if needed
|
|
763
|
-
|
|
764
|
-
try:
|
|
765
|
-
print("DEBUG: create_method script: ParentPOU='%s', Name='%s', ReturnType='%s', Project='%s'" % (PARENT_POU_FULL_PATH, METHOD_NAME, RETURN_TYPE, PROJECT_FILE_PATH))
|
|
766
|
-
primary_project = ensure_project_open(PROJECT_FILE_PATH)
|
|
767
|
-
if not PARENT_POU_FULL_PATH: raise ValueError("Parent POU full path empty.")
|
|
768
|
-
if not METHOD_NAME: raise ValueError("Method name empty.")
|
|
769
|
-
# RETURN_TYPE can be empty
|
|
770
|
-
|
|
771
|
-
# Find the parent POU object
|
|
772
|
-
parent_pou_object = find_object_by_path_robust(primary_project, PARENT_POU_FULL_PATH, "parent POU")
|
|
773
|
-
if not parent_pou_object: raise ValueError("Parent POU object not found: %s" % PARENT_POU_FULL_PATH)
|
|
774
|
-
|
|
775
|
-
parent_pou_name = getattr(parent_pou_object, 'get_name', lambda: PARENT_POU_FULL_PATH)()
|
|
776
|
-
print("DEBUG: Found Parent POU object: %s" % parent_pou_name)
|
|
777
|
-
|
|
778
|
-
# Check if parent object supports creating methods (should implement ScriptIecLanguageMemberContainer)
|
|
779
|
-
if not hasattr(parent_pou_object, 'create_method'):
|
|
780
|
-
raise TypeError("Parent object '%s' of type %s does not support create_method." % (parent_pou_name, type(parent_pou_object).__name__))
|
|
781
|
-
|
|
782
|
-
# Default language to None (usually ST)
|
|
783
|
-
lang_guid = None
|
|
784
|
-
# Use None if RETURN_TYPE is empty string, otherwise use the string
|
|
785
|
-
actual_return_type = RETURN_TYPE if RETURN_TYPE else None
|
|
786
|
-
print("DEBUG: Calling create_method: Name='%s', ReturnType=%s, Lang=%s" % (METHOD_NAME, actual_return_type, lang_guid))
|
|
787
|
-
|
|
788
|
-
# Call the create_method method ON THE PARENT POU
|
|
789
|
-
new_method_object = parent_pou_object.create_method(
|
|
790
|
-
name=METHOD_NAME,
|
|
791
|
-
return_type=actual_return_type,
|
|
792
|
-
language=lang_guid # Pass None to use default
|
|
793
|
-
)
|
|
794
|
-
|
|
795
|
-
if new_method_object:
|
|
796
|
-
new_meth_name = getattr(new_method_object, 'get_name', lambda: METHOD_NAME)()
|
|
797
|
-
print("DEBUG: Method object created: %s" % new_meth_name)
|
|
798
|
-
|
|
799
|
-
# --- SAVE THE PROJECT TO PERSIST THE NEW METHOD OBJECT ---
|
|
800
|
-
try:
|
|
801
|
-
print("DEBUG: Saving Project (after method creation)...")
|
|
802
|
-
primary_project.save()
|
|
803
|
-
print("DEBUG: Project saved successfully after method creation.")
|
|
804
|
-
except Exception as save_err:
|
|
805
|
-
print("ERROR: Failed to save Project after creating method: %s" % save_err)
|
|
806
|
-
detailed_error = traceback.format_exc()
|
|
807
|
-
error_message = "Error saving Project after creating method '%s': %s\\n%s" % (METHOD_NAME, save_err, detailed_error)
|
|
808
|
-
print(error_message); print("SCRIPT_ERROR: %s" % error_message); sys.exit(1)
|
|
809
|
-
# --- END SAVING ---
|
|
810
|
-
|
|
811
|
-
print("Method Created: %s" % new_meth_name)
|
|
812
|
-
print("Parent POU: %s" % PARENT_POU_FULL_PATH)
|
|
813
|
-
print("Return Type: %s" % (RETURN_TYPE if RETURN_TYPE else "(None)"))
|
|
814
|
-
print("SCRIPT_SUCCESS: Method created successfully."); sys.exit(0)
|
|
815
|
-
else:
|
|
816
|
-
error_message = "Failed to create method '%s' under '%s'. create_method returned None." % (METHOD_NAME, parent_pou_name)
|
|
817
|
-
print(error_message); print("SCRIPT_ERROR: %s" % error_message); sys.exit(1)
|
|
818
|
-
|
|
819
|
-
except Exception as e:
|
|
820
|
-
detailed_error = traceback.format_exc()
|
|
821
|
-
error_message = "Error creating method '%s' under POU '%s' in project '%s': %s\\n%s" % (METHOD_NAME, PARENT_POU_FULL_PATH, PROJECT_FILE_PATH, e, detailed_error)
|
|
822
|
-
print(error_message); print("SCRIPT_ERROR: %s" % error_message); sys.exit(1)
|
|
823
|
-
`;
|
|
824
|
-
const COMPILE_PROJECT_SCRIPT_TEMPLATE = `
|
|
825
|
-
import sys, scriptengine as script_engine, os, traceback
|
|
826
|
-
${ENSURE_PROJECT_OPEN_PYTHON_SNIPPET}
|
|
827
|
-
try:
|
|
828
|
-
print("DEBUG: compile_project script: Project='%s'" % PROJECT_FILE_PATH)
|
|
829
|
-
primary_project = ensure_project_open(PROJECT_FILE_PATH)
|
|
830
|
-
project_name = os.path.basename(PROJECT_FILE_PATH)
|
|
831
|
-
target_app = None
|
|
832
|
-
app_name = "N/A"
|
|
833
|
-
|
|
834
|
-
# Try getting active application first
|
|
835
|
-
try:
|
|
836
|
-
target_app = primary_project.active_application
|
|
837
|
-
if target_app:
|
|
838
|
-
app_name = getattr(target_app, 'get_name', lambda: "Unnamed App (Active)")()
|
|
839
|
-
print("DEBUG: Found active application: %s" % app_name)
|
|
840
|
-
except Exception as active_err:
|
|
841
|
-
print("WARN: Could not get active application: %s. Searching..." % active_err)
|
|
842
|
-
|
|
843
|
-
# If no active app, search for the first one
|
|
844
|
-
if not target_app:
|
|
845
|
-
print("DEBUG: Searching for first compilable application...")
|
|
846
|
-
apps = []
|
|
847
|
-
try:
|
|
848
|
-
# Search recursively through all project objects
|
|
849
|
-
all_children = primary_project.get_children(True)
|
|
850
|
-
for child in all_children:
|
|
851
|
-
# Check using the marker property and if build method exists
|
|
852
|
-
if hasattr(child, 'is_application') and child.is_application and hasattr(child, 'build'):
|
|
853
|
-
app_name_found = getattr(child, 'get_name', lambda: "Unnamed App")()
|
|
854
|
-
print("DEBUG: Found potential application object: %s" % app_name_found)
|
|
855
|
-
apps.append(child)
|
|
856
|
-
break # Take the first one found
|
|
857
|
-
except Exception as find_err: print("WARN: Error finding application object: %s" % find_err)
|
|
858
|
-
|
|
859
|
-
if not apps: raise RuntimeError("No compilable application found in project '%s'" % project_name)
|
|
860
|
-
target_app = apps[0]
|
|
861
|
-
app_name = getattr(target_app, 'get_name', lambda: "Unnamed App (First Found)")()
|
|
862
|
-
print("WARN: Compiling first found application: %s" % app_name)
|
|
863
|
-
|
|
864
|
-
print("DEBUG: Calling build() on app '%s'..." % app_name)
|
|
865
|
-
if not hasattr(target_app, 'build'):
|
|
866
|
-
raise TypeError("Selected object '%s' is not an application or doesn't support build()." % app_name)
|
|
867
|
-
|
|
868
|
-
# Execute the build
|
|
869
|
-
target_app.build();
|
|
870
|
-
print("DEBUG: Build command executed for application '%s'." % app_name)
|
|
871
|
-
|
|
872
|
-
# Check messages is harder without direct access to message store from script.
|
|
873
|
-
# Rely on CODESYS UI or log output for now.
|
|
874
|
-
print("Compile Initiated For Application: %s" % app_name); print("In Project: %s" % project_name)
|
|
875
|
-
print("SCRIPT_SUCCESS: Application compilation initiated."); sys.exit(0)
|
|
876
|
-
except Exception as e:
|
|
877
|
-
detailed_error = traceback.format_exc()
|
|
878
|
-
error_message = "Error initiating compilation for project %s: %s\\n%s" % (PROJECT_FILE_PATH, e, detailed_error)
|
|
879
|
-
print(error_message); print("SCRIPT_ERROR: %s" % error_message); sys.exit(1)
|
|
880
|
-
`;
|
|
881
|
-
const GET_PROJECT_STRUCTURE_SCRIPT_TEMPLATE = `
|
|
882
|
-
import sys, scriptengine as script_engine, os, traceback
|
|
883
|
-
${ENSURE_PROJECT_OPEN_PYTHON_SNIPPET}
|
|
884
|
-
# FIND_OBJECT_BY_PATH_PYTHON_SNIPPET is NOT needed here, we start from project root.
|
|
885
|
-
|
|
886
|
-
def get_object_structure(obj, indent=0, max_depth=10): # Add max_depth
|
|
887
|
-
lines = []; indent_str = " " * indent
|
|
888
|
-
if indent > max_depth:
|
|
889
|
-
lines.append("%s- Max recursion depth reached." % indent_str)
|
|
890
|
-
return lines
|
|
891
|
-
try:
|
|
892
|
-
name = "Unnamed"; obj_type = type(obj).__name__
|
|
893
|
-
guid_str = ""
|
|
894
|
-
folder_str = ""
|
|
895
|
-
try:
|
|
896
|
-
name = getattr(obj, 'get_name', lambda: "Unnamed")() or "Unnamed" # Safer get_name
|
|
897
|
-
if hasattr(obj, 'guid'): guid_str = " {%s}" % obj.guid
|
|
898
|
-
if hasattr(obj, 'is_folder') and obj.is_folder: folder_str = " [Folder]"
|
|
899
|
-
except Exception as name_err:
|
|
900
|
-
print("WARN: Error getting name/guid/folder status for an object: %s" % name_err)
|
|
901
|
-
name = "!!! Error Getting Name !!!"
|
|
902
|
-
|
|
903
|
-
lines.append("%s- %s (%s)%s%s" % (indent_str, name, obj_type, folder_str, guid_str))
|
|
904
|
-
|
|
905
|
-
# Get children only if the object potentially has them
|
|
906
|
-
children = []
|
|
907
|
-
can_have_children = hasattr(obj, 'get_children') and (
|
|
908
|
-
not hasattr(obj, 'is_folder') or # If it's not clear if it's a folder (e.g., project root)
|
|
909
|
-
(hasattr(obj, 'is_folder') and obj.is_folder) or # If it is a folder
|
|
910
|
-
# Add known container types explicitly, check marker interfaces too
|
|
911
|
-
hasattr(obj, 'is_project') or hasattr(obj, 'is_application') or hasattr(obj, 'is_device') or hasattr(obj,'is_pou')
|
|
912
|
-
)
|
|
913
|
-
|
|
914
|
-
if can_have_children:
|
|
915
|
-
try:
|
|
916
|
-
children = obj.get_children(False)
|
|
917
|
-
# print("DEBUG: %s has %d children" % (name, len(children))) # Verbose
|
|
918
|
-
except Exception as get_child_err:
|
|
919
|
-
lines.append("%s ERROR getting children: %s" % (indent_str, get_child_err))
|
|
920
|
-
# traceback.print_exc() # Optional
|
|
921
|
-
|
|
922
|
-
for child in children:
|
|
923
|
-
lines.extend(get_object_structure(child, indent + 1, max_depth)) # Recurse
|
|
924
|
-
|
|
925
|
-
except Exception as e:
|
|
926
|
-
lines.append("%s- Error processing node: %s" % (indent_str, e))
|
|
927
|
-
traceback.print_exc() # Print detailed error for this node
|
|
928
|
-
return lines
|
|
929
|
-
try:
|
|
930
|
-
print("DEBUG: Getting structure for: %s" % PROJECT_FILE_PATH)
|
|
931
|
-
primary_project = ensure_project_open(PROJECT_FILE_PATH)
|
|
932
|
-
project_name = os.path.basename(PROJECT_FILE_PATH)
|
|
933
|
-
print("DEBUG: Getting structure for project: %s" % project_name)
|
|
934
|
-
# Use the project object obtained from ensure_project_open
|
|
935
|
-
structure_list = get_object_structure(primary_project, max_depth=15) # Set a reasonable depth
|
|
936
|
-
structure_output = "\\n".join(structure_list)
|
|
937
|
-
# Ensure markers are printed distinctly
|
|
938
|
-
print("\\n--- PROJECT STRUCTURE START ---")
|
|
939
|
-
print(structure_output)
|
|
940
|
-
print("--- PROJECT STRUCTURE END ---\\n")
|
|
941
|
-
print("SCRIPT_SUCCESS: Project structure retrieved."); sys.exit(0)
|
|
942
|
-
except Exception as e:
|
|
943
|
-
detailed_error = traceback.format_exc()
|
|
944
|
-
error_message = "Error getting structure for %s: %s\\n%s" % (PROJECT_FILE_PATH, e, detailed_error)
|
|
945
|
-
print(error_message); print("SCRIPT_ERROR: %s" % error_message); sys.exit(1)
|
|
946
|
-
`;
|
|
947
|
-
const GET_POU_CODE_SCRIPT_TEMPLATE = `
|
|
948
|
-
import sys, scriptengine as script_engine, os, traceback
|
|
949
|
-
${ENSURE_PROJECT_OPEN_PYTHON_SNIPPET}
|
|
950
|
-
${FIND_OBJECT_BY_PATH_PYTHON_SNIPPET}
|
|
951
|
-
POU_FULL_PATH = "{POU_FULL_PATH}"; CODE_START_MARKER = "### POU CODE START ###"; CODE_END_MARKER = "### POU CODE END ###"
|
|
952
|
-
DECL_START_MARKER = "### POU DECLARATION START ###"; DECL_END_MARKER = "### POU DECLARATION END ###"
|
|
953
|
-
IMPL_START_MARKER = "### POU IMPLEMENTATION START ###"; IMPL_END_MARKER = "### POU IMPLEMENTATION END ###"
|
|
954
|
-
|
|
955
|
-
try:
|
|
956
|
-
print("DEBUG: Getting code: POU_FULL_PATH='%s', Project='%s'" % (POU_FULL_PATH, PROJECT_FILE_PATH))
|
|
957
|
-
primary_project = ensure_project_open(PROJECT_FILE_PATH)
|
|
958
|
-
if not POU_FULL_PATH: raise ValueError("POU full path empty.")
|
|
959
|
-
|
|
960
|
-
# Find the target POU/Method/Property object
|
|
961
|
-
target_object = find_object_by_path_robust(primary_project, POU_FULL_PATH, "target object")
|
|
962
|
-
if not target_object: raise ValueError("Target object not found using path: %s" % POU_FULL_PATH)
|
|
963
|
-
|
|
964
|
-
target_name = getattr(target_object, 'get_name', lambda: POU_FULL_PATH)()
|
|
965
|
-
print("DEBUG: Found target object: %s" % target_name)
|
|
966
|
-
|
|
967
|
-
declaration_code = ""; implementation_code = ""
|
|
968
|
-
|
|
969
|
-
# --- Get Declaration Part ---
|
|
970
|
-
if hasattr(target_object, 'textual_declaration'):
|
|
971
|
-
decl_obj = target_object.textual_declaration
|
|
972
|
-
if decl_obj and hasattr(decl_obj, 'text'):
|
|
973
|
-
try:
|
|
974
|
-
declaration_code = decl_obj.text
|
|
975
|
-
print("DEBUG: Got declaration text.")
|
|
976
|
-
except Exception as decl_read_err:
|
|
977
|
-
print("ERROR: Failed to read declaration text: %s" % decl_read_err)
|
|
978
|
-
declaration_code = "/* ERROR reading declaration: %s */" % decl_read_err
|
|
979
|
-
else:
|
|
980
|
-
print("WARN: textual_declaration exists but is None or has no 'text' attribute.")
|
|
981
|
-
else:
|
|
982
|
-
print("WARN: No textual_declaration attribute.")
|
|
983
|
-
|
|
984
|
-
# --- Get Implementation Part ---
|
|
985
|
-
if hasattr(target_object, 'textual_implementation'):
|
|
986
|
-
impl_obj = target_object.textual_implementation
|
|
987
|
-
if impl_obj and hasattr(impl_obj, 'text'):
|
|
988
|
-
try:
|
|
989
|
-
implementation_code = impl_obj.text
|
|
990
|
-
print("DEBUG: Got implementation text.")
|
|
991
|
-
except Exception as impl_read_err:
|
|
992
|
-
print("ERROR: Failed to read implementation text: %s" % impl_read_err)
|
|
993
|
-
implementation_code = "/* ERROR reading implementation: %s */" % impl_read_err
|
|
994
|
-
else:
|
|
995
|
-
print("WARN: textual_implementation exists but is None or has no 'text' attribute.")
|
|
996
|
-
else:
|
|
997
|
-
print("WARN: No textual_implementation attribute.")
|
|
998
|
-
|
|
999
|
-
|
|
1000
|
-
print("Code retrieved for: %s" % target_name)
|
|
1001
|
-
# Print declaration between markers, ensuring markers are on separate lines
|
|
1002
|
-
print("\\n" + DECL_START_MARKER)
|
|
1003
|
-
print(declaration_code)
|
|
1004
|
-
print(DECL_END_MARKER + "\\n")
|
|
1005
|
-
# Print implementation between markers
|
|
1006
|
-
print(IMPL_START_MARKER)
|
|
1007
|
-
print(implementation_code)
|
|
1008
|
-
print(IMPL_END_MARKER + "\\n")
|
|
1009
|
-
|
|
1010
|
-
# --- LEGACY MARKERS for backward compatibility if needed ---
|
|
1011
|
-
# Combine both for old marker format, adding a separator line
|
|
1012
|
-
# legacy_combined_code = declaration_code + "\\n\\n// Implementation\\n" + implementation_code
|
|
1013
|
-
# print(CODE_START_MARKER); print(legacy_combined_code); print(CODE_END_MARKER)
|
|
1014
|
-
# --- END LEGACY ---
|
|
1015
|
-
|
|
1016
|
-
print("SCRIPT_SUCCESS: Code retrieved."); sys.exit(0)
|
|
1017
|
-
except Exception as e:
|
|
1018
|
-
detailed_error = traceback.format_exc()
|
|
1019
|
-
error_message = "Error getting code for object '%s' in project '%s': %s\\n%s" % (POU_FULL_PATH, PROJECT_FILE_PATH, e, detailed_error)
|
|
1020
|
-
print(error_message); print("SCRIPT_ERROR: %s" % error_message); sys.exit(1)
|
|
1021
|
-
`;
|
|
1022
|
-
// --- End Python Script Templates ---
|
|
1023
|
-
// --- Zod Schemas (moved for clarity before usage) ---
|
|
136
|
+
// --- Zod Schemas ---
|
|
1024
137
|
const PouTypeEnum = zod_1.z.enum(["Program", "FunctionBlock", "Function"]);
|
|
1025
138
|
const ImplementationLanguageEnum = zod_1.z.enum(["ST", "LD", "FBD", "SFC", "IL", "CFC", "StructuredText", "LadderDiagram", "FunctionBlockDiagram", "SequentialFunctionChart", "InstructionList", "ContinuousFunctionChart"]);
|
|
1026
139
|
// --- End Zod Schemas ---
|
|
@@ -1031,45 +144,53 @@ except Exception as e:
|
|
|
1031
144
|
var _a, _b, _c, _d, _e;
|
|
1032
145
|
console.error(`SERVER.TS Resource request: ${uri.href}`);
|
|
1033
146
|
try {
|
|
1034
|
-
const
|
|
147
|
+
const scriptContent = yield (0, scriptLoader_1.loadScriptTemplate)('check_status');
|
|
148
|
+
const result = yield (0, codesys_interop_1.executeCodesysScript)(scriptContent, codesysExePath, codesysProfileName);
|
|
1035
149
|
const outputLines = result.output.split(/[\r\n]+/).filter(line => line.trim());
|
|
1036
150
|
const statusData = {};
|
|
1037
|
-
outputLines.forEach(line => {
|
|
1038
|
-
|
|
1039
|
-
|
|
151
|
+
outputLines.forEach(line => {
|
|
152
|
+
const match = line.match(/^([^:]+):\s*(.*)$/);
|
|
153
|
+
if (match) {
|
|
154
|
+
statusData[match[1].trim()] = match[2].trim();
|
|
155
|
+
}
|
|
156
|
+
});
|
|
1040
157
|
const statusText = `CODESYS Status:\n - Scripting OK: ${(_a = statusData['Scripting OK']) !== null && _a !== void 0 ? _a : 'Unknown'}\n - Project Open: ${(_b = statusData['Project Open']) !== null && _b !== void 0 ? _b : 'Unknown'}\n - Project Name: ${(_c = statusData['Project Name']) !== null && _c !== void 0 ? _c : 'Unknown'}\n - Project Path: ${(_d = statusData['Project Path']) !== null && _d !== void 0 ? _d : 'N/A'}`;
|
|
1041
158
|
const isError = !result.success || ((_e = statusData['Scripting OK']) === null || _e === void 0 ? void 0 : _e.toLowerCase()) !== 'true';
|
|
1042
|
-
// **** RETURN MCP STRUCTURE ****
|
|
1043
159
|
return { contents: [{ uri: uri.href, text: statusText, contentType: "text/plain" }], isError: isError };
|
|
1044
160
|
}
|
|
1045
161
|
catch (error) {
|
|
1046
162
|
console.error(`Error resource ${uri.href}:`, error);
|
|
1047
|
-
// **** RETURN MCP STRUCTURE ****
|
|
1048
163
|
return { contents: [{ uri: uri.href, text: `Failed status script: ${error.message}`, contentType: "text/plain" }], isError: true };
|
|
1049
164
|
}
|
|
1050
165
|
}));
|
|
1051
|
-
//
|
|
166
|
+
// Templates
|
|
1052
167
|
const projectStructureTemplate = new mcp_js_1.ResourceTemplate("codesys://project/{+project_path}/structure", { list: undefined });
|
|
1053
168
|
const pouCodeTemplate = new mcp_js_1.ResourceTemplate("codesys://project/{+project_path}/pou/{+pou_path}/code", { list: undefined });
|
|
1054
|
-
// *** END DEFINE TEMPLATES ***
|
|
1055
169
|
server.resource("project-structure", projectStructureTemplate, (uri, params) => __awaiter(this, void 0, void 0, function* () {
|
|
1056
|
-
// *** DEFINE VARIABLES (like projectPath) ***
|
|
1057
170
|
const projectPathParam = params.project_path;
|
|
1058
171
|
if (typeof projectPathParam !== 'string') {
|
|
1059
|
-
return {
|
|
172
|
+
return {
|
|
173
|
+
contents: [{ uri: uri.href, text: `Error: Invalid project path type (${typeof projectPathParam}).`, contentType: "text/plain" }],
|
|
174
|
+
isError: true
|
|
175
|
+
};
|
|
1060
176
|
}
|
|
1061
|
-
const projectPath = projectPathParam;
|
|
177
|
+
const projectPath = projectPathParam;
|
|
1062
178
|
if (!projectPath) {
|
|
1063
|
-
return {
|
|
179
|
+
return {
|
|
180
|
+
contents: [{ uri: uri.href, text: "Error: Project path missing.", contentType: "text/plain" }],
|
|
181
|
+
isError: true
|
|
182
|
+
};
|
|
1064
183
|
}
|
|
1065
|
-
// *** END DEFINE VARIABLES ***
|
|
1066
184
|
console.error(`Resource request: project structure for ${projectPath}`);
|
|
1067
185
|
try {
|
|
1068
186
|
const absoluteProjPath = path.normalize(path.isAbsolute(projectPath) ? projectPath : path.join(WORKSPACE_DIR, projectPath));
|
|
1069
|
-
|
|
1070
|
-
|
|
1071
|
-
const
|
|
1072
|
-
|
|
187
|
+
// Load script template and prepare parameters
|
|
188
|
+
const scriptTemplate = yield (0, scriptLoader_1.loadScriptTemplate)('get_project_structure');
|
|
189
|
+
const ensureProjectOpenTemplate = yield (0, scriptLoader_1.loadScriptTemplate)('ensure_project_open');
|
|
190
|
+
const combinedScript = ensureProjectOpenTemplate + '\n\n' + scriptTemplate;
|
|
191
|
+
const scriptContent = (0, scriptLoader_1.interpolateScript)(combinedScript, {
|
|
192
|
+
'PROJECT_FILE_PATH': absoluteProjPath.replace(/\\/g, '\\\\')
|
|
193
|
+
});
|
|
1073
194
|
const result = yield (0, codesys_interop_1.executeCodesysScript)(scriptContent, codesysExePath, codesysProfileName);
|
|
1074
195
|
let structureText = `Error retrieving structure for ${absoluteProjPath}.\n\n${result.output}`;
|
|
1075
196
|
let isError = !result.success;
|
|
@@ -1090,42 +211,47 @@ except Exception as e:
|
|
|
1090
211
|
else {
|
|
1091
212
|
isError = true;
|
|
1092
213
|
}
|
|
1093
|
-
// **** RETURN MCP STRUCTURE ****
|
|
1094
214
|
return { contents: [{ uri: uri.href, text: structureText, contentType: "text/plain" }], isError: isError };
|
|
1095
215
|
}
|
|
1096
216
|
catch (error) {
|
|
1097
217
|
console.error(`Error getting structure ${uri.href}:`, error);
|
|
1098
|
-
// **** RETURN MCP STRUCTURE ****
|
|
1099
218
|
return { contents: [{ uri: uri.href, text: `Failed structure script for '${projectPath}': ${error.message}`, contentType: "text/plain" }], isError: true };
|
|
1100
219
|
}
|
|
1101
220
|
}));
|
|
1102
221
|
server.resource("pou-code", pouCodeTemplate, (uri, params) => __awaiter(this, void 0, void 0, function* () {
|
|
1103
|
-
// *** DEFINE VARIABLES (like projectPath, pouPath) ***
|
|
1104
222
|
const projectPathParam = params.project_path;
|
|
1105
223
|
const pouPathParam = params.pou_path;
|
|
1106
224
|
if (typeof projectPathParam !== 'string' || typeof pouPathParam !== 'string') {
|
|
1107
|
-
return {
|
|
225
|
+
return {
|
|
226
|
+
contents: [{ uri: uri.href, text: "Error: Invalid project or POU path type.", contentType: "text/plain" }],
|
|
227
|
+
isError: true
|
|
228
|
+
};
|
|
1108
229
|
}
|
|
1109
|
-
const projectPath = projectPathParam;
|
|
1110
|
-
const pouPath = pouPathParam;
|
|
230
|
+
const projectPath = projectPathParam;
|
|
231
|
+
const pouPath = pouPathParam;
|
|
1111
232
|
if (!projectPath || !pouPath) {
|
|
1112
|
-
return {
|
|
233
|
+
return {
|
|
234
|
+
contents: [{ uri: uri.href, text: "Error: Project or POU path missing.", contentType: "text/plain" }],
|
|
235
|
+
isError: true
|
|
236
|
+
};
|
|
1113
237
|
}
|
|
1114
|
-
// *** END DEFINE VARIABLES ***
|
|
1115
238
|
console.error(`Resource request: POU code: Project='${projectPath}', POU='${pouPath}'`);
|
|
1116
239
|
try {
|
|
1117
240
|
const absoluteProjPath = path.normalize(path.isAbsolute(projectPath) ? projectPath : path.join(WORKSPACE_DIR, projectPath));
|
|
1118
241
|
const sanitizedPouPath = String(pouPath).replace(/\\/g, '/').replace(/^\/+|\/+$/g, '');
|
|
1119
|
-
|
|
1120
|
-
|
|
1121
|
-
|
|
1122
|
-
|
|
1123
|
-
|
|
242
|
+
// Load script template and prepare parameters
|
|
243
|
+
const scriptTemplate = yield (0, scriptLoader_1.loadScriptTemplate)('get_pou_code');
|
|
244
|
+
const ensureProjectOpenTemplate = yield (0, scriptLoader_1.loadScriptTemplate)('ensure_project_open');
|
|
245
|
+
const findObjectByPathTemplate = yield (0, scriptLoader_1.loadScriptTemplate)('find_object_by_path');
|
|
246
|
+
const combinedScript = ensureProjectOpenTemplate + '\n\n' + findObjectByPathTemplate + '\n\n' + scriptTemplate;
|
|
247
|
+
const scriptContent = (0, scriptLoader_1.interpolateScript)(combinedScript, {
|
|
248
|
+
'PROJECT_FILE_PATH': absoluteProjPath.replace(/\\/g, '\\\\'),
|
|
249
|
+
'POU_FULL_PATH': sanitizedPouPath
|
|
250
|
+
});
|
|
1124
251
|
const result = yield (0, codesys_interop_1.executeCodesysScript)(scriptContent, codesysExePath, codesysProfileName);
|
|
1125
252
|
let codeText = `Error retrieving code for object '${sanitizedPouPath}' in project '${absoluteProjPath}'.\n\n${result.output}`;
|
|
1126
253
|
let isError = !result.success;
|
|
1127
254
|
if (result.success && result.output.includes("SCRIPT_SUCCESS")) {
|
|
1128
|
-
// ... (marker parsing logic using new markers) ...
|
|
1129
255
|
const declStartMarker = "### POU DECLARATION START ###";
|
|
1130
256
|
const declEndMarker = "### POU DECLARATION END ###";
|
|
1131
257
|
const implStartMarker = "### POU IMPLEMENTATION START ###";
|
|
@@ -1149,49 +275,61 @@ except Exception as e:
|
|
|
1149
275
|
console.error(`WARN: Implementation markers not found correctly for ${sanitizedPouPath}`);
|
|
1150
276
|
}
|
|
1151
277
|
codeText = `// ----- Declaration -----\n${declaration}\n\n// ----- Implementation -----\n${implementation}`;
|
|
1152
|
-
// *** END MARKER PARSING ***
|
|
1153
278
|
}
|
|
1154
279
|
else {
|
|
1155
280
|
isError = true;
|
|
1156
281
|
}
|
|
1157
|
-
// **** RETURN MCP STRUCTURE ****
|
|
1158
282
|
return { contents: [{ uri: uri.href, text: codeText, contentType: "text/plain" }], isError: isError };
|
|
1159
283
|
}
|
|
1160
284
|
catch (error) {
|
|
1161
285
|
console.error(`Error getting POU code ${uri.href}:`, error);
|
|
1162
|
-
// **** RETURN MCP STRUCTURE ****
|
|
1163
286
|
return { contents: [{ uri: uri.href, text: `Failed POU code script for '${pouPath}' in '${projectPath}': ${error.message}`, contentType: "text/plain" }], isError: true };
|
|
1164
287
|
}
|
|
1165
288
|
}));
|
|
1166
289
|
// --- End Resources ---
|
|
1167
290
|
// --- Tools ---
|
|
1168
|
-
server.tool("open_project",
|
|
291
|
+
server.tool("open_project", "Opens an existing CODESYS project file.", {
|
|
292
|
+
filePath: zod_1.z.string().describe("Path to the project file (e.g., 'C:/Projects/MyPLC.project' or '/Users/user/projects/my_project.project').")
|
|
293
|
+
}, (args) => __awaiter(this, void 0, void 0, function* () {
|
|
1169
294
|
const { filePath } = args;
|
|
1170
295
|
let absPath = path.normalize(path.isAbsolute(filePath) ? filePath : path.join(WORKSPACE_DIR, filePath));
|
|
1171
296
|
console.error(`Tool call: open_project: ${absPath}`);
|
|
1172
297
|
try {
|
|
1173
|
-
|
|
1174
|
-
|
|
1175
|
-
|
|
1176
|
-
|
|
1177
|
-
const
|
|
298
|
+
// Load the script template and prepare with parameters
|
|
299
|
+
const scriptTemplate = yield (0, scriptLoader_1.loadScriptTemplate)('open_project');
|
|
300
|
+
// Combine with required ensure_project_open script (will handle any imports)
|
|
301
|
+
const ensureProjectOpenScript = yield (0, scriptLoader_1.loadScriptTemplate)('ensure_project_open');
|
|
302
|
+
const combinedScript = ensureProjectOpenScript + '\n\n' + scriptTemplate;
|
|
303
|
+
const scriptContent = (0, scriptLoader_1.interpolateScript)(combinedScript, {
|
|
304
|
+
'PROJECT_FILE_PATH': absPath.replace(/\\/g, '\\\\')
|
|
305
|
+
});
|
|
306
|
+
const result = yield (0, codesys_interop_1.executeCodesysScript)(scriptContent, codesysExePath, codesysProfileName);
|
|
1178
307
|
const success = result.success && result.output.includes("SCRIPT_SUCCESS");
|
|
1179
|
-
|
|
1180
|
-
|
|
308
|
+
return {
|
|
309
|
+
content: [{
|
|
310
|
+
type: "text",
|
|
311
|
+
text: success ? `Project opened: ${absPath}` : `Failed open project ${absPath}. Output:\n${result.output}`
|
|
312
|
+
}],
|
|
313
|
+
isError: !success
|
|
314
|
+
};
|
|
1181
315
|
}
|
|
1182
316
|
catch (e) {
|
|
1183
317
|
console.error(`Error open_project ${absPath}: ${e}`);
|
|
1184
|
-
|
|
1185
|
-
|
|
318
|
+
return {
|
|
319
|
+
content: [{ type: "text", text: `Error: ${e.message}` }],
|
|
320
|
+
isError: true
|
|
321
|
+
};
|
|
1186
322
|
}
|
|
1187
323
|
}));
|
|
1188
|
-
server.tool("create_project",
|
|
324
|
+
server.tool("create_project", "Creates a new CODESYS project from the standard template.", {
|
|
325
|
+
filePath: zod_1.z.string().describe("Path where the new project file should be created (e.g., 'C:/Projects/NewPLC.project' or '/Users/user/projects/new_project.project').")
|
|
326
|
+
}, (args) => __awaiter(this, void 0, void 0, function* () {
|
|
1189
327
|
const { filePath } = args;
|
|
1190
328
|
let absPath = path.normalize(path.isAbsolute(filePath) ? filePath : path.join(WORKSPACE_DIR, filePath));
|
|
1191
329
|
console.error(`Tool call: create_project (copy template): ${absPath}`);
|
|
1192
330
|
let templatePath = "";
|
|
1193
331
|
try {
|
|
1194
|
-
// Template finding logic
|
|
332
|
+
// Template finding logic
|
|
1195
333
|
const baseDir = path.dirname(path.dirname(codesysExePath));
|
|
1196
334
|
templatePath = path.normalize(path.join(baseDir, 'Templates', 'Standard.project'));
|
|
1197
335
|
if (!(yield fileExists(templatePath))) {
|
|
@@ -1218,60 +356,79 @@ except Exception as e:
|
|
|
1218
356
|
else {
|
|
1219
357
|
console.error(`DEBUG: Found template relative to exe: ${templatePath}`);
|
|
1220
358
|
}
|
|
1221
|
-
// *** END TEMPLATE FINDING ***
|
|
1222
359
|
}
|
|
1223
360
|
catch (e) {
|
|
1224
361
|
console.error(`Template Error: ${e.message}`);
|
|
1225
|
-
|
|
1226
|
-
|
|
362
|
+
return {
|
|
363
|
+
content: [{ type: "text", text: `Template Error: ${e.message}` }],
|
|
364
|
+
isError: true
|
|
365
|
+
};
|
|
1227
366
|
}
|
|
1228
367
|
try {
|
|
1229
|
-
|
|
1230
|
-
const
|
|
1231
|
-
|
|
1232
|
-
|
|
1233
|
-
.replace(
|
|
1234
|
-
|
|
1235
|
-
|
|
1236
|
-
|
|
1237
|
-
const result = yield (0, codesys_interop_1.executeCodesysScript)(script, codesysExePath, codesysProfileName);
|
|
368
|
+
// Load script template and interpolate parameters
|
|
369
|
+
const scriptTemplate = yield (0, scriptLoader_1.loadScriptTemplate)('create_project');
|
|
370
|
+
const scriptContent = (0, scriptLoader_1.interpolateScript)(scriptTemplate, {
|
|
371
|
+
'PROJECT_FILE_PATH': absPath.replace(/\\/g, '\\\\'),
|
|
372
|
+
'TEMPLATE_PROJECT_PATH': templatePath.replace(/\\/g, '\\\\')
|
|
373
|
+
});
|
|
374
|
+
console.error(">>> create_project (copy-then-open): PREPARED SCRIPT:", scriptContent.substring(0, 500) + "...");
|
|
375
|
+
const result = yield (0, codesys_interop_1.executeCodesysScript)(scriptContent, codesysExePath, codesysProfileName);
|
|
1238
376
|
console.error(">>> create_project (copy-then-open): EXECUTION RESULT:", JSON.stringify(result));
|
|
1239
377
|
const success = result.success && result.output.includes("SCRIPT_SUCCESS");
|
|
1240
|
-
|
|
1241
|
-
|
|
378
|
+
return {
|
|
379
|
+
content: [{
|
|
380
|
+
type: "text",
|
|
381
|
+
text: success ? `Project created from template: ${absPath}` : `Failed create project ${absPath} from template. Output:\n${result.output}`
|
|
382
|
+
}],
|
|
383
|
+
isError: !success
|
|
384
|
+
};
|
|
1242
385
|
}
|
|
1243
386
|
catch (e) {
|
|
1244
387
|
console.error(`Error create_project ${absPath}: ${e}`);
|
|
1245
|
-
|
|
1246
|
-
|
|
388
|
+
return {
|
|
389
|
+
content: [{ type: "text", text: `Error: ${e.message}` }],
|
|
390
|
+
isError: true
|
|
391
|
+
};
|
|
1247
392
|
}
|
|
1248
393
|
}));
|
|
1249
|
-
server.tool("save_project",
|
|
394
|
+
server.tool("save_project", "Saves the currently open CODESYS project.", {
|
|
395
|
+
projectFilePath: zod_1.z.string().describe("Path to the project file to ensure is open before saving (e.g., 'C:/Projects/MyPLC.project').")
|
|
396
|
+
}, (args) => __awaiter(this, void 0, void 0, function* () {
|
|
1250
397
|
const { projectFilePath } = args;
|
|
1251
398
|
let absPath = path.normalize(path.isAbsolute(projectFilePath) ? projectFilePath : path.join(WORKSPACE_DIR, projectFilePath));
|
|
1252
399
|
console.error(`Tool call: save_project: ${absPath}`);
|
|
1253
400
|
try {
|
|
1254
|
-
|
|
1255
|
-
|
|
1256
|
-
const
|
|
1257
|
-
|
|
1258
|
-
const
|
|
401
|
+
// Load and combine script templates
|
|
402
|
+
const saveProjectTemplate = yield (0, scriptLoader_1.loadScriptTemplate)('save_project');
|
|
403
|
+
const ensureProjectOpenTemplate = yield (0, scriptLoader_1.loadScriptTemplate)('ensure_project_open');
|
|
404
|
+
const combinedScript = ensureProjectOpenTemplate + '\n\n' + saveProjectTemplate;
|
|
405
|
+
const scriptContent = (0, scriptLoader_1.interpolateScript)(combinedScript, {
|
|
406
|
+
'PROJECT_FILE_PATH': absPath.replace(/\\/g, '\\\\')
|
|
407
|
+
});
|
|
408
|
+
const result = yield (0, codesys_interop_1.executeCodesysScript)(scriptContent, codesysExePath, codesysProfileName);
|
|
1259
409
|
const success = result.success && result.output.includes("SCRIPT_SUCCESS");
|
|
1260
|
-
|
|
1261
|
-
|
|
410
|
+
return {
|
|
411
|
+
content: [{
|
|
412
|
+
type: "text",
|
|
413
|
+
text: success ? `Project saved: ${absPath}` : `Failed save project ${absPath}. Output:\n${result.output}`
|
|
414
|
+
}],
|
|
415
|
+
isError: !success
|
|
416
|
+
};
|
|
1262
417
|
}
|
|
1263
418
|
catch (e) {
|
|
1264
419
|
console.error(`Error save_project ${absPath}: ${e}`);
|
|
1265
|
-
|
|
1266
|
-
|
|
420
|
+
return {
|
|
421
|
+
content: [{ type: "text", text: `Error: ${e.message}` }],
|
|
422
|
+
isError: true
|
|
423
|
+
};
|
|
1267
424
|
}
|
|
1268
425
|
}));
|
|
1269
|
-
server.tool("create_pou", {
|
|
1270
|
-
projectFilePath: zod_1.z.string().describe("Path to project."),
|
|
1271
|
-
name: zod_1.z.string().describe("Name for the new POU."),
|
|
426
|
+
server.tool("create_pou", "Creates a new Program, Function Block, or Function POU within the specified CODESYS project.", {
|
|
427
|
+
projectFilePath: zod_1.z.string().describe("Path to the project file (e.g., 'C:/Projects/MyPLC.project')."),
|
|
428
|
+
name: zod_1.z.string().describe("Name for the new POU (must be a valid IEC identifier)."),
|
|
1272
429
|
type: PouTypeEnum.describe("Type of POU (Program, FunctionBlock, Function)."),
|
|
1273
|
-
language: ImplementationLanguageEnum.describe("Implementation language (ST, LD, FBD, etc.).
|
|
1274
|
-
parentPath: zod_1.z.string().describe("Relative path under project
|
|
430
|
+
language: ImplementationLanguageEnum.describe("Implementation language (ST, LD, FBD, etc.). CODESYS default will be used if specific language is not set or directly supported by scripting for this POU type."),
|
|
431
|
+
parentPath: zod_1.z.string().describe("Relative path under project root or application where the POU should be created (e.g., 'Application' or 'MyFolder/SubFolder').")
|
|
1275
432
|
}, (args) => __awaiter(this, void 0, void 0, function* () {
|
|
1276
433
|
const { projectFilePath, name, type, language, parentPath } = args;
|
|
1277
434
|
let absPath = path.normalize(path.isAbsolute(projectFilePath) ? projectFilePath : path.join(WORKSPACE_DIR, projectFilePath));
|
|
@@ -1279,68 +436,93 @@ except Exception as e:
|
|
|
1279
436
|
const sanName = name.trim();
|
|
1280
437
|
console.error(`Tool call: create_pou: Name='${sanName}', Type='${type}', Lang='${language}', Parent='${sanParentPath}', Project='${absPath}'`);
|
|
1281
438
|
try {
|
|
1282
|
-
|
|
1283
|
-
|
|
1284
|
-
|
|
1285
|
-
|
|
1286
|
-
|
|
1287
|
-
|
|
1288
|
-
|
|
1289
|
-
|
|
1290
|
-
|
|
1291
|
-
|
|
439
|
+
// Load and combine script templates
|
|
440
|
+
const createPouTemplate = yield (0, scriptLoader_1.loadScriptTemplate)('create_pou');
|
|
441
|
+
const ensureProjectOpenTemplate = yield (0, scriptLoader_1.loadScriptTemplate)('ensure_project_open');
|
|
442
|
+
const findObjectByPathTemplate = yield (0, scriptLoader_1.loadScriptTemplate)('find_object_by_path');
|
|
443
|
+
const combinedScript = ensureProjectOpenTemplate + '\n\n' + findObjectByPathTemplate + '\n\n' + createPouTemplate;
|
|
444
|
+
const scriptContent = (0, scriptLoader_1.interpolateScript)(combinedScript, {
|
|
445
|
+
'PROJECT_FILE_PATH': absPath.replace(/\\/g, '\\\\'),
|
|
446
|
+
'POU_NAME': sanName,
|
|
447
|
+
'POU_TYPE_STR': type,
|
|
448
|
+
'IMPL_LANGUAGE_STR': language,
|
|
449
|
+
'PARENT_PATH': sanParentPath
|
|
450
|
+
});
|
|
451
|
+
console.error(">>> create_pou: PREPARED SCRIPT:", scriptContent.substring(0, 500) + "...");
|
|
452
|
+
const result = yield (0, codesys_interop_1.executeCodesysScript)(scriptContent, codesysExePath, codesysProfileName);
|
|
1292
453
|
console.error(">>> create_pou: EXECUTION RESULT:", JSON.stringify(result));
|
|
1293
454
|
const success = result.success && result.output.includes("SCRIPT_SUCCESS");
|
|
1294
|
-
|
|
1295
|
-
|
|
455
|
+
return {
|
|
456
|
+
content: [{
|
|
457
|
+
type: "text",
|
|
458
|
+
text: success ? `POU '${sanName}' created in '${sanParentPath}' of ${absPath}. Project saved.` : `Failed create POU '${sanName}'. Output:\n${result.output}`
|
|
459
|
+
}],
|
|
460
|
+
isError: !success
|
|
461
|
+
};
|
|
1296
462
|
}
|
|
1297
463
|
catch (e) {
|
|
1298
464
|
console.error(`Error create_pou ${sanName} in ${absPath}: ${e}`);
|
|
1299
|
-
|
|
1300
|
-
|
|
465
|
+
return {
|
|
466
|
+
content: [{ type: "text", text: `Error: ${e.message}` }],
|
|
467
|
+
isError: true
|
|
468
|
+
};
|
|
1301
469
|
}
|
|
1302
470
|
}));
|
|
1303
|
-
server.tool("set_pou_code", {
|
|
1304
|
-
projectFilePath: zod_1.z.string().describe("Path to project."),
|
|
1305
|
-
pouPath: zod_1.z.string().describe("
|
|
1306
|
-
declarationCode: zod_1.z.string().describe("Code for the declaration part (VAR...END_VAR).").optional(),
|
|
1307
|
-
implementationCode: zod_1.z.string().describe("Code for the implementation logic part.").optional()
|
|
471
|
+
server.tool("set_pou_code", "Sets the declaration and/or implementation code for a specific POU, Method, or Property.", {
|
|
472
|
+
projectFilePath: zod_1.z.string().describe("Path to the project file (e.g., 'C:/Projects/MyPLC.project')."),
|
|
473
|
+
pouPath: zod_1.z.string().describe("Full relative path to the target object (e.g., 'Application/MyPOU', 'MyFolder/MyFB/MyMethod', 'MyFolder/MyFB/MyProperty')."),
|
|
474
|
+
declarationCode: zod_1.z.string().describe("Code for the declaration part (VAR...END_VAR). If omitted, the declaration is not changed.").optional(),
|
|
475
|
+
implementationCode: zod_1.z.string().describe("Code for the implementation logic part. If omitted, the implementation is not changed.").optional()
|
|
1308
476
|
}, (args) => __awaiter(this, void 0, void 0, function* () {
|
|
1309
477
|
const { projectFilePath, pouPath, declarationCode, implementationCode } = args;
|
|
1310
478
|
if (declarationCode === undefined && implementationCode === undefined) {
|
|
1311
|
-
return {
|
|
479
|
+
return {
|
|
480
|
+
content: [{ type: "text", text: "Error: At least one of declarationCode or implementationCode must be provided." }],
|
|
481
|
+
isError: true
|
|
482
|
+
};
|
|
1312
483
|
}
|
|
1313
484
|
let absPath = path.normalize(path.isAbsolute(projectFilePath) ? projectFilePath : path.join(WORKSPACE_DIR, projectFilePath));
|
|
1314
485
|
const sanPouPath = pouPath.replace(/\\/g, '/').replace(/^\/+|\/+$/g, '');
|
|
1315
486
|
console.error(`Tool call: set_pou_code: Target='${sanPouPath}', Project='${absPath}'`);
|
|
1316
487
|
try {
|
|
1317
|
-
|
|
488
|
+
// Load and combine script templates
|
|
489
|
+
const setPouCodeTemplate = yield (0, scriptLoader_1.loadScriptTemplate)('set_pou_code');
|
|
490
|
+
const ensureProjectOpenTemplate = yield (0, scriptLoader_1.loadScriptTemplate)('ensure_project_open');
|
|
491
|
+
const findObjectByPathTemplate = yield (0, scriptLoader_1.loadScriptTemplate)('find_object_by_path');
|
|
492
|
+
const combinedScript = ensureProjectOpenTemplate + '\n\n' + findObjectByPathTemplate + '\n\n' + setPouCodeTemplate;
|
|
1318
493
|
// Escape content for Python triple-quoted strings
|
|
1319
494
|
const sanDeclCode = (declarationCode !== null && declarationCode !== void 0 ? declarationCode : "").replace(/\\/g, '\\\\').replace(/"""/g, '\\"\\"\\"');
|
|
1320
495
|
const sanImplCode = (implementationCode !== null && implementationCode !== void 0 ? implementationCode : "").replace(/\\/g, '\\\\').replace(/"""/g, '\\"\\"\\"');
|
|
1321
|
-
|
|
1322
|
-
|
|
1323
|
-
|
|
1324
|
-
|
|
1325
|
-
|
|
1326
|
-
|
|
1327
|
-
console.error(">>> set_pou_code: PREPARED SCRIPT:",
|
|
1328
|
-
const result = yield (0, codesys_interop_1.executeCodesysScript)(
|
|
496
|
+
const scriptContent = (0, scriptLoader_1.interpolateScript)(combinedScript, {
|
|
497
|
+
'PROJECT_FILE_PATH': absPath.replace(/\\/g, '\\\\'),
|
|
498
|
+
'POU_FULL_PATH': sanPouPath,
|
|
499
|
+
'DECLARATION_CONTENT': sanDeclCode,
|
|
500
|
+
'IMPLEMENTATION_CONTENT': sanImplCode
|
|
501
|
+
});
|
|
502
|
+
console.error(">>> set_pou_code: PREPARED SCRIPT:", scriptContent.substring(0, 500) + "...");
|
|
503
|
+
const result = yield (0, codesys_interop_1.executeCodesysScript)(scriptContent, codesysExePath, codesysProfileName);
|
|
1329
504
|
console.error(">>> set_pou_code: EXECUTION RESULT:", JSON.stringify(result));
|
|
1330
505
|
const success = result.success && result.output.includes("SCRIPT_SUCCESS");
|
|
1331
|
-
|
|
1332
|
-
|
|
506
|
+
return {
|
|
507
|
+
content: [{
|
|
508
|
+
type: "text",
|
|
509
|
+
text: success ? `Code set for '${sanPouPath}' in ${absPath}. Project saved.` : `Failed set code for '${sanPouPath}'. Output:\n${result.output}`
|
|
510
|
+
}],
|
|
511
|
+
isError: !success
|
|
512
|
+
};
|
|
1333
513
|
}
|
|
1334
514
|
catch (e) {
|
|
1335
515
|
console.error(`Error set_pou_code ${sanPouPath} in ${absPath}: ${e}`);
|
|
1336
|
-
|
|
1337
|
-
|
|
516
|
+
return {
|
|
517
|
+
content: [{ type: "text", text: `Error: ${e.message}` }],
|
|
518
|
+
isError: true
|
|
519
|
+
};
|
|
1338
520
|
}
|
|
1339
521
|
}));
|
|
1340
|
-
server.tool("create_property", {
|
|
1341
|
-
projectFilePath: zod_1.z.string().describe("Path to the project file."),
|
|
1342
|
-
parentPouPath: zod_1.z.string().describe("Relative path to the parent POU (e.g., 'Application/MyFB')."),
|
|
1343
|
-
propertyName: zod_1.z.string().describe("Name
|
|
522
|
+
server.tool("create_property", "Creates a new Property within a specific Function Block POU.", {
|
|
523
|
+
projectFilePath: zod_1.z.string().describe("Path to the project file (e.g., 'C:/Projects/MyPLC.project')."),
|
|
524
|
+
parentPouPath: zod_1.z.string().describe("Relative path to the parent Function Block POU (e.g., 'Application/MyFB')."),
|
|
525
|
+
propertyName: zod_1.z.string().describe("Name for the new property (must be a valid IEC identifier)."),
|
|
1344
526
|
propertyType: zod_1.z.string().describe("Data type of the property (e.g., 'BOOL', 'INT', 'MyDUT').")
|
|
1345
527
|
}, (args) => __awaiter(this, void 0, void 0, function* () {
|
|
1346
528
|
const { projectFilePath, parentPouPath, propertyName, propertyType } = args;
|
|
@@ -1350,38 +532,48 @@ except Exception as e:
|
|
|
1350
532
|
const sanPropType = propertyType.trim();
|
|
1351
533
|
console.error(`Tool call: create_property: Name='${sanPropName}', Type='${sanPropType}', ParentPOU='${sanParentPath}', Project='${absPath}'`);
|
|
1352
534
|
if (!sanPropName || !sanPropType) {
|
|
1353
|
-
|
|
1354
|
-
|
|
535
|
+
return {
|
|
536
|
+
content: [{ type: "text", text: `Error: Property name and type cannot be empty.` }],
|
|
537
|
+
isError: true
|
|
538
|
+
};
|
|
1355
539
|
}
|
|
1356
540
|
try {
|
|
1357
|
-
|
|
1358
|
-
|
|
1359
|
-
|
|
1360
|
-
|
|
1361
|
-
|
|
1362
|
-
|
|
1363
|
-
|
|
1364
|
-
|
|
1365
|
-
|
|
541
|
+
// Load and combine script templates
|
|
542
|
+
const createPropertyTemplate = yield (0, scriptLoader_1.loadScriptTemplate)('create_property');
|
|
543
|
+
const ensureProjectOpenTemplate = yield (0, scriptLoader_1.loadScriptTemplate)('ensure_project_open');
|
|
544
|
+
const findObjectByPathTemplate = yield (0, scriptLoader_1.loadScriptTemplate)('find_object_by_path');
|
|
545
|
+
const combinedScript = ensureProjectOpenTemplate + '\n\n' + findObjectByPathTemplate + '\n\n' + createPropertyTemplate;
|
|
546
|
+
const scriptContent = (0, scriptLoader_1.interpolateScript)(combinedScript, {
|
|
547
|
+
'PROJECT_FILE_PATH': absPath.replace(/\\/g, '\\\\'),
|
|
548
|
+
'PARENT_POU_FULL_PATH': sanParentPath,
|
|
549
|
+
'PROPERTY_NAME': sanPropName,
|
|
550
|
+
'PROPERTY_TYPE': sanPropType
|
|
551
|
+
});
|
|
552
|
+
console.error(">>> create_property: PREPARED SCRIPT:", scriptContent.substring(0, 500) + "...");
|
|
553
|
+
const result = yield (0, codesys_interop_1.executeCodesysScript)(scriptContent, codesysExePath, codesysProfileName);
|
|
1366
554
|
console.error(">>> create_property: EXECUTION RESULT:", JSON.stringify(result));
|
|
1367
555
|
const success = result.success && result.output.includes("SCRIPT_SUCCESS");
|
|
1368
|
-
// **** RETURN MCP STRUCTURE ****
|
|
1369
556
|
return {
|
|
1370
|
-
content: [{
|
|
557
|
+
content: [{
|
|
558
|
+
type: "text",
|
|
559
|
+
text: success ? `Property '${sanPropName}' created under '${sanParentPath}' in ${absPath}. Project saved.` : `Failed to create property '${sanPropName}'. Output:\n${result.output}`
|
|
560
|
+
}],
|
|
1371
561
|
isError: !success
|
|
1372
562
|
};
|
|
1373
563
|
}
|
|
1374
564
|
catch (e) {
|
|
1375
565
|
console.error(`Error create_property ${sanPropName} in ${absPath}: ${e}`);
|
|
1376
|
-
|
|
1377
|
-
|
|
566
|
+
return {
|
|
567
|
+
content: [{ type: "text", text: `Error: ${e.message}` }],
|
|
568
|
+
isError: true
|
|
569
|
+
};
|
|
1378
570
|
}
|
|
1379
571
|
}));
|
|
1380
|
-
server.tool("create_method", {
|
|
1381
|
-
projectFilePath: zod_1.z.string().describe("Path to the project file."),
|
|
1382
|
-
parentPouPath: zod_1.z.string().describe("Relative path to the parent POU (e.g., 'Application/MyFB')."),
|
|
1383
|
-
methodName: zod_1.z.string().describe("Name of the new method."),
|
|
1384
|
-
returnType: zod_1.z.string().optional().describe("Return type (e.g., 'BOOL', 'INT'). Leave empty or omit for no return value.")
|
|
572
|
+
server.tool("create_method", "Creates a new Method within a specific Function Block POU.", {
|
|
573
|
+
projectFilePath: zod_1.z.string().describe("Path to the project file (e.g., 'C:/Projects/MyPLC.project')."),
|
|
574
|
+
parentPouPath: zod_1.z.string().describe("Relative path to the parent Function Block POU (e.g., 'Application/MyFB')."),
|
|
575
|
+
methodName: zod_1.z.string().describe("Name of the new method (must be a valid IEC identifier)."),
|
|
576
|
+
returnType: zod_1.z.string().optional().describe("Return type (e.g., 'BOOL', 'INT'). Leave empty or omit for no return value (PROCEDURE).")
|
|
1385
577
|
}, (args) => __awaiter(this, void 0, void 0, function* () {
|
|
1386
578
|
const { projectFilePath, parentPouPath, methodName, returnType } = args;
|
|
1387
579
|
let absPath = path.normalize(path.isAbsolute(projectFilePath) ? projectFilePath : path.join(WORKSPACE_DIR, projectFilePath));
|
|
@@ -1390,60 +582,80 @@ except Exception as e:
|
|
|
1390
582
|
const sanReturnType = (returnType !== null && returnType !== void 0 ? returnType : "").trim();
|
|
1391
583
|
console.error(`Tool call: create_method: Name='${sanMethName}', Return='${sanReturnType}', ParentPOU='${sanParentPath}', Project='${absPath}'`);
|
|
1392
584
|
if (!sanMethName) {
|
|
1393
|
-
|
|
1394
|
-
|
|
585
|
+
return {
|
|
586
|
+
content: [{ type: "text", text: `Error: Method name cannot be empty.` }],
|
|
587
|
+
isError: true
|
|
588
|
+
};
|
|
1395
589
|
}
|
|
1396
590
|
try {
|
|
1397
|
-
|
|
1398
|
-
|
|
1399
|
-
|
|
1400
|
-
|
|
1401
|
-
|
|
1402
|
-
|
|
1403
|
-
|
|
1404
|
-
|
|
1405
|
-
|
|
591
|
+
// Load and combine script templates
|
|
592
|
+
const createMethodTemplate = yield (0, scriptLoader_1.loadScriptTemplate)('create_method');
|
|
593
|
+
const ensureProjectOpenTemplate = yield (0, scriptLoader_1.loadScriptTemplate)('ensure_project_open');
|
|
594
|
+
const findObjectByPathTemplate = yield (0, scriptLoader_1.loadScriptTemplate)('find_object_by_path');
|
|
595
|
+
const combinedScript = ensureProjectOpenTemplate + '\n\n' + findObjectByPathTemplate + '\n\n' + createMethodTemplate;
|
|
596
|
+
const scriptContent = (0, scriptLoader_1.interpolateScript)(combinedScript, {
|
|
597
|
+
'PROJECT_FILE_PATH': absPath.replace(/\\/g, '\\\\'),
|
|
598
|
+
'PARENT_POU_FULL_PATH': sanParentPath,
|
|
599
|
+
'METHOD_NAME': sanMethName,
|
|
600
|
+
'RETURN_TYPE': sanReturnType
|
|
601
|
+
});
|
|
602
|
+
console.error(">>> create_method: PREPARED SCRIPT:", scriptContent.substring(0, 500) + "...");
|
|
603
|
+
const result = yield (0, codesys_interop_1.executeCodesysScript)(scriptContent, codesysExePath, codesysProfileName);
|
|
1406
604
|
console.error(">>> create_method: EXECUTION RESULT:", JSON.stringify(result));
|
|
1407
605
|
const success = result.success && result.output.includes("SCRIPT_SUCCESS");
|
|
1408
|
-
// **** RETURN MCP STRUCTURE ****
|
|
1409
606
|
return {
|
|
1410
|
-
content: [{
|
|
607
|
+
content: [{
|
|
608
|
+
type: "text",
|
|
609
|
+
text: success ? `Method '${sanMethName}' created under '${sanParentPath}' in ${absPath}. Project saved.` : `Failed to create method '${sanMethName}'. Output:\n${result.output}`
|
|
610
|
+
}],
|
|
1411
611
|
isError: !success
|
|
1412
612
|
};
|
|
1413
613
|
}
|
|
1414
614
|
catch (e) {
|
|
1415
615
|
console.error(`Error create_method ${sanMethName} in ${absPath}: ${e}`);
|
|
1416
|
-
|
|
1417
|
-
|
|
616
|
+
return {
|
|
617
|
+
content: [{ type: "text", text: `Error: ${e.message}` }],
|
|
618
|
+
isError: true
|
|
619
|
+
};
|
|
1418
620
|
}
|
|
1419
621
|
}));
|
|
1420
|
-
server.tool("compile_project",
|
|
622
|
+
server.tool("compile_project", "Compiles (Builds) the primary application within a CODESYS project.", {
|
|
623
|
+
projectFilePath: zod_1.z.string().describe("Path to the project file containing the application to compile (e.g., 'C:/Projects/MyPLC.project').")
|
|
624
|
+
}, (args) => __awaiter(this, void 0, void 0, function* () {
|
|
1421
625
|
const { projectFilePath } = args;
|
|
1422
626
|
let absPath = path.normalize(path.isAbsolute(projectFilePath) ? projectFilePath : path.join(WORKSPACE_DIR, projectFilePath));
|
|
1423
627
|
console.error(`Tool call: compile_project: ${absPath}`);
|
|
1424
628
|
try {
|
|
1425
|
-
|
|
1426
|
-
|
|
1427
|
-
const
|
|
1428
|
-
|
|
1429
|
-
const
|
|
629
|
+
// Load and combine script templates
|
|
630
|
+
const compileProjectTemplate = yield (0, scriptLoader_1.loadScriptTemplate)('compile_project');
|
|
631
|
+
const ensureProjectOpenTemplate = yield (0, scriptLoader_1.loadScriptTemplate)('ensure_project_open');
|
|
632
|
+
const combinedScript = ensureProjectOpenTemplate + '\n\n' + compileProjectTemplate;
|
|
633
|
+
const scriptContent = (0, scriptLoader_1.interpolateScript)(combinedScript, {
|
|
634
|
+
'PROJECT_FILE_PATH': absPath.replace(/\\/g, '\\\\')
|
|
635
|
+
});
|
|
636
|
+
const result = yield (0, codesys_interop_1.executeCodesysScript)(scriptContent, codesysExePath, codesysProfileName);
|
|
1430
637
|
const success = result.success && result.output.includes("SCRIPT_SUCCESS");
|
|
638
|
+
// Check for actual compile errors in the output log
|
|
1431
639
|
const hasCompileErrors = result.output.includes("Compile complete --") && !/ 0 error\(s\),/.test(result.output);
|
|
1432
640
|
let message = success ? `Compilation initiated for application in ${absPath}. Check CODESYS messages for results.` : `Failed initiating compilation for ${absPath}. Output:\n${result.output}`;
|
|
1433
641
|
let isError = !success; // Base error status on script success
|
|
1434
642
|
if (success && hasCompileErrors) {
|
|
1435
643
|
message += " WARNING: Build command reported errors in the output log.";
|
|
1436
644
|
console.warn("Compile project reported build errors in the output.");
|
|
1437
|
-
//
|
|
645
|
+
// Report as error if compile fails, even if script technically succeeded
|
|
1438
646
|
isError = true;
|
|
1439
647
|
}
|
|
1440
|
-
|
|
1441
|
-
|
|
648
|
+
return {
|
|
649
|
+
content: [{ type: "text", text: message }],
|
|
650
|
+
isError: isError
|
|
651
|
+
};
|
|
1442
652
|
}
|
|
1443
653
|
catch (e) {
|
|
1444
654
|
console.error(`Error compile_project ${absPath}: ${e}`);
|
|
1445
|
-
|
|
1446
|
-
|
|
655
|
+
return {
|
|
656
|
+
content: [{ type: "text", text: `Error: ${e.message}` }],
|
|
657
|
+
isError: true
|
|
658
|
+
};
|
|
1447
659
|
}
|
|
1448
660
|
}));
|
|
1449
661
|
// --- End Tools ---
|
|
@@ -1455,16 +667,13 @@ except Exception as e:
|
|
|
1455
667
|
const transport = new stdio_js_1.StdioServerTransport();
|
|
1456
668
|
console.error("SERVER.TS: Connecting MCP server via stdio...");
|
|
1457
669
|
// No need to await connect here if startMcpServer is called by bin.ts which awaits it
|
|
1458
|
-
// await server.connect(transport);
|
|
1459
670
|
server.connect(transport); // Connect but don't await here, let bin.ts handle waiting
|
|
1460
671
|
console.error("SERVER.TS: MCP Server connection initiated via stdio.");
|
|
1461
|
-
// console.error("SERVER.TS: server.connect() promise resolved successfully."); // This log might be premature now
|
|
1462
672
|
}
|
|
1463
673
|
catch (error) {
|
|
1464
674
|
console.error("FATAL: Failed to initiate MCP server connection:", error);
|
|
1465
675
|
// Re-throw error so bin.ts can catch it
|
|
1466
676
|
throw error;
|
|
1467
|
-
// process.exit(1);
|
|
1468
677
|
}
|
|
1469
678
|
// --- End Server Connection ---
|
|
1470
679
|
});
|