@friggframework/admin-scripts 2.0.0--canary.517.7e78259.0 → 2.0.0--canary.517.2239974.0

package/src/infrastructure/admin-script-router.js

@@ -3,6 +3,7 @@ const serverless = require('serverless-http');
 const { validateAdminApiKey } = require('./admin-auth-middleware');
 const { getScriptFactory } = require('../application/script-factory');
 const { createScriptRunner } = require('../application/script-runner');
+const { validateScriptInput } = require('../application/validate-script-input');
 const { createAdminScriptCommands } = require('@friggframework/core/application/commands/admin-script-commands');
 const { QueuerUtil } = require('@friggframework/core/queues');
 const { createSchedulerAdapter } = require('../adapters/scheduler-adapter-factory');
@@ -95,13 +96,13 @@ router.get('/scripts/:scriptName', async (req, res) => {
 });
 
 /**
- * POST /admin/scripts/:scriptName
- * Execute a script (sync, async, or dry-run)
+ * POST /admin/scripts/:scriptName/validate
+ * Validate script inputs without executing (dry-run)
  */
-router.post('/scripts/:scriptName', async (req, res) => {
+router.post('/scripts/:scriptName/validate', async (req, res) => {
     try {
         const { scriptName } = req.params;
-        const { params = {}, mode = 'async', dryRun = false } = req.body;
+        const { params = {} } = req.body;
         const factory = getScriptFactory();
 
         if (!factory.has(scriptName)) {
@@ -111,19 +112,32 @@ router.post('/scripts/:scriptName', async (req, res) => {
             });
         }
 
-        // Dry-run always executes synchronously
-        if (dryRun) {
-            const runner = createScriptRunner();
-            const result = await runner.execute(scriptName, params, {
-                trigger: 'MANUAL',
-                mode: 'sync',
-                dryRun: true,
+        const result = validateScriptInput(factory, scriptName, params);
+        res.json(result);
+    } catch (error) {
+        console.error('Error validating script:', error);
+        res.status(500).json({ error: 'Failed to validate script' });
+    }
+});
+
+/**
+ * POST /admin/scripts/:scriptName
+ * Execute a script (sync or async)
+ */
+router.post('/scripts/:scriptName', async (req, res) => {
+    try {
+        const { scriptName } = req.params;
+        const { params = {}, mode = 'async' } = req.body;
+        const factory = getScriptFactory();
+
+        if (!factory.has(scriptName)) {
+            return res.status(404).json({
+                error: `Script "${scriptName}" not found`,
+                code: 'SCRIPT_NOT_FOUND',
             });
-            return res.json(result);
         }
 
         if (mode === 'sync') {
-            // Synchronous execution - wait for result
             const runner = createScriptRunner();
             const result = await runner.execute(scriptName, params, {
                 trigger: 'MANUAL',
@@ -155,7 +169,7 @@ router.post('/scripts/:scriptName', async (req, res) => {
 
         res.status(202).json({
             executionId: execution.id,
-            status: 'PENDING',
+            status: 'QUEUED',
             scriptName,
             message: 'Script queued for execution',
         });

package/src/infrastructure/script-executor-handler.js

@@ -1,65 +1,48 @@
 const { createScriptRunner } = require('../application/script-runner');
-const { createAdminScriptCommands } = require('@friggframework/core/application/commands/admin-script-commands');
 
 /**
  * SQS Queue Worker Lambda Handler
  *
- * Processes script execution messages from AdminScriptQueue
+ * Processes script execution messages from AdminScriptQueue.
+ * Thin adapter: parses SQS messages and delegates to ScriptRunner.
+ * ScriptRunner handles execution tracking, error recording, and status updates.
  */
 async function handler(event) {
     const results = [];
 
     for (const record of event.Records) {
-        const message = JSON.parse(record.body);
-        const { scriptName, executionId, trigger, params } = message;
-
-        console.log(`Processing script: ${scriptName}, executionId: ${executionId}`);
+        let scriptName;
 
         try {
-            const runner = createScriptRunner();
-            const commands = createAdminScriptCommands();
+            const message = JSON.parse(record.body);
+            ({ scriptName } = message);
+            const { executionId, trigger, params } = message;
 
-            // If executionId provided (async from API), update existing record
-            if (executionId) {
-                await commands.updateAdminProcessState(executionId, 'RUNNING');
+            if (!scriptName || !executionId) {
+                throw new Error(`Invalid SQS message: missing scriptName or executionId`);
             }
 
+            console.log(`Processing script: ${scriptName}, executionId: ${executionId}`);
+
+            const runner = createScriptRunner();
             const result = await runner.execute(scriptName, params, {
                 trigger: trigger || 'QUEUE',
                 mode: 'async',
-                executionId, // Reuse existing if provided
+                executionId,
             });
 
-            console.log(
-                `Script completed: ${scriptName}, status: ${result.status}`
-            );
+            console.log(`Script completed: ${scriptName}, status: ${result.status}`);
             results.push({
                 scriptName,
                 status: result.status,
                 executionId: result.executionId,
             });
         } catch (error) {
-            console.error(`Script failed: ${scriptName}`, error);
-
-            // Try to update execution status if we have an ID
-            if (executionId) {
-                const commands = createAdminScriptCommands();
-                await commands
-                    .completeAdminProcess(executionId, {
-                        state: 'FAILED',
-                        error: {
-                            name: error.name,
-                            message: error.message,
-                            stack: error.stack,
-                        },
-                    })
-                    .catch((e) =>
-                        console.error('Failed to update execution:', e)
-                    );
-            }
-
+            // Only reaches here for unexpected failures (message parse errors, runner construction).
+            // Script execution errors are handled by ScriptRunner and returned as { status: 'FAILED' }.
+            console.error(`Unexpected error processing record:`, error);
             results.push({
-                scriptName,
+                scriptName: scriptName || 'unknown',
                 status: 'FAILED',
                 error: error.message,
             });