@friggframework/admin-scripts 2.0.0--canary.517.ff03f2c.0 → 2.0.0--canary.517.c197eb5.0

package/package.json

@@ -1,18 +1,19 @@
 {
     "name": "@friggframework/admin-scripts",
     "prettier": "@friggframework/prettier-config",
-    "version": "2.0.0--canary.517.ff03f2c.0",
+    "version": "2.0.0--canary.517.c197eb5.0",
     "description": "Admin Script Runner for Frigg - Execute maintenance and operational scripts in hosted environments",
     "dependencies": {
         "@aws-sdk/client-scheduler": "^3.588.0",
-        "@friggframework/core": "2.0.0--canary.517.ff03f2c.0",
+        "@friggframework/core": "2.0.0--canary.517.c197eb5.0",
+        "@hapi/boom": "^10.0.1",
         "express": "^4.18.2",
         "serverless-http": "^3.2.0"
     },
     "devDependencies": {
-        "@friggframework/eslint-config": "2.0.0--canary.517.ff03f2c.0",
-        "@friggframework/prettier-config": "2.0.0--canary.517.ff03f2c.0",
-        "@friggframework/test": "2.0.0--canary.517.ff03f2c.0",
+        "@friggframework/eslint-config": "2.0.0--canary.517.c197eb5.0",
+        "@friggframework/prettier-config": "2.0.0--canary.517.c197eb5.0",
+        "@friggframework/test": "2.0.0--canary.517.c197eb5.0",
         "eslint": "^8.22.0",
         "jest": "^29.7.0",
         "prettier": "^2.7.1",
@@ -43,5 +44,5 @@
         "maintenance",
         "operations"
     ],
-    "gitHead": "ff03f2c9204a318789ed105c09cc9d44deeae6ec"
+    "gitHead": "c197eb5c237e263a8d1b65a94f213ee4732b3c57"
 }

package/src/application/use-cases/__tests__/delete-schedule-use-case.test.js

@@ -170,7 +170,7 @@ describe('DeleteScheduleUseCase', () => {
             try {
                 await useCase.execute('non-existent');
             } catch (error) {
-                expect(error.code).toBe('SCRIPT_NOT_FOUND');
+                expect(error.output.statusCode).toBe(404);
             }
         });
     });

package/src/application/use-cases/__tests__/get-effective-schedule-use-case.test.js

@@ -112,7 +112,7 @@ describe('GetEffectiveScheduleUseCase', () => {
             try {
                 await useCase.execute('non-existent');
             } catch (error) {
-                expect(error.code).toBe('SCRIPT_NOT_FOUND');
+                expect(error.output.statusCode).toBe(404);
             }
         });
     });

package/src/application/use-cases/__tests__/upsert-schedule-use-case.test.js

@@ -153,7 +153,7 @@ describe('UpsertScheduleUseCase', () => {
             try {
                 await useCase.execute('non-existent', { enabled: true });
             } catch (error) {
-                expect(error.code).toBe('SCRIPT_NOT_FOUND');
+                expect(error.output.statusCode).toBe(404);
             }
         });
 
@@ -167,7 +167,7 @@ describe('UpsertScheduleUseCase', () => {
             try {
                 await useCase.execute('test-script', { enabled: 'yes' });
             } catch (error) {
-                expect(error.code).toBe('INVALID_INPUT');
+                expect(error.output.statusCode).toBe(400);
             }
         });
 
@@ -183,7 +183,7 @@ describe('UpsertScheduleUseCase', () => {
             try {
                 await useCase.execute('test-script', { enabled: true });
             } catch (error) {
-                expect(error.code).toBe('INVALID_INPUT');
+                expect(error.output.statusCode).toBe(400);
             }
         });
 

package/src/application/use-cases/delete-schedule-use-case.js

@@ -1,3 +1,5 @@
+const Boom = require('@hapi/boom');
+
 /**
  * Delete Schedule Use Case
  *
@@ -51,9 +53,7 @@ class DeleteScheduleUseCase {
      */
     _validateScriptExists(scriptName) {
         if (!this.scriptFactory.has(scriptName)) {
-            const error = new Error(`Script "${scriptName}" not found`);
-            error.code = 'SCRIPT_NOT_FOUND';
-            throw error;
+            throw Boom.notFound(`Script "${scriptName}" not found`);
         }
     }
 

package/src/application/use-cases/get-effective-schedule-use-case.js

@@ -1,3 +1,5 @@
+const Boom = require('@hapi/boom');
+
 /**
  * Get Effective Schedule Use Case
  *
@@ -62,9 +64,7 @@ class GetEffectiveScheduleUseCase {
      */
     _validateScriptExists(scriptName) {
         if (!this.scriptFactory.has(scriptName)) {
-            const error = new Error(`Script "${scriptName}" not found`);
-            error.code = 'SCRIPT_NOT_FOUND';
-            throw error;
+            throw Boom.notFound(`Script "${scriptName}" not found`);
         }
     }
 

package/src/application/use-cases/upsert-schedule-use-case.js

@@ -1,3 +1,5 @@
+const Boom = require('@hapi/boom');
+
 /**
  * Upsert Schedule Use Case
  *
@@ -65,9 +67,7 @@ class UpsertScheduleUseCase {
      */
     _validateScriptExists(scriptName) {
         if (!this.scriptFactory.has(scriptName)) {
-            const error = new Error(`Script "${scriptName}" not found`);
-            error.code = 'SCRIPT_NOT_FOUND';
-            throw error;
+            throw Boom.notFound(`Script "${scriptName}" not found`);
         }
     }
 
@@ -76,17 +76,13 @@ class UpsertScheduleUseCase {
      */
     _validateInput(enabled, cronExpression) {
         if (typeof enabled !== 'boolean') {
-            const error = new Error('enabled must be a boolean');
-            error.code = 'INVALID_INPUT';
-            throw error;
+            throw Boom.badRequest('enabled must be a boolean');
         }
 
         if (enabled && !cronExpression) {
-            const error = new Error(
+            throw Boom.badRequest(
                 'cronExpression is required when enabled is true'
             );
-            error.code = 'INVALID_INPUT';
-            throw error;
         }
     }
 

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

@@ -404,7 +404,7 @@ describe('Admin Script Router', () => {
             );
 
             expect(response.status).toBe(404);
-            expect(response.body.code).toBe('SCRIPT_NOT_FOUND');
+            expect(response.body.error).toMatch(/not found/i);
         });
     });
 
@@ -481,7 +481,6 @@ describe('Admin Script Router', () => {
                 });
 
             expect(response.status).toBe(400);
-            expect(response.body.code).toBe('INVALID_INPUT');
             expect(response.body.error).toContain('enabled');
         });
 
@@ -493,7 +492,6 @@ describe('Admin Script Router', () => {
                 });
 
             expect(response.status).toBe(400);
-            expect(response.body.code).toBe('INVALID_INPUT');
             expect(response.body.error).toContain('cronExpression');
         });
 
@@ -508,7 +506,7 @@ describe('Admin Script Router', () => {
                 });
 
             expect(response.status).toBe(404);
-            expect(response.body.code).toBe('SCRIPT_NOT_FOUND');
+            expect(response.body.error).toMatch(/not found/i);
         });
 
         it('should provision EventBridge schedule when enabled', async () => {
@@ -712,7 +710,7 @@ describe('Admin Script Router', () => {
             );
 
             expect(response.status).toBe(404);
-            expect(response.body.code).toBe('SCRIPT_NOT_FOUND');
+            expect(response.body.error).toMatch(/not found/i);
         });
 
         it('should delete EventBridge schedule when external rule exists', async () => {

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

@@ -1,5 +1,6 @@
 const express = require('express');
 const serverless = require('serverless-http');
+const Boom = require('@hapi/boom');
 const { validateAdminApiKey } = require('./admin-auth-middleware');
 const { getScriptFactory } = require('../application/script-factory');
 const { createScriptRunner } = require('../application/script-runner');
@@ -26,13 +27,27 @@ const router = express.Router();
 // Apply auth middleware to all admin routes
 router.use(validateAdminApiKey);
 
-// Register the host app's admin scripts (and built-ins) before handling requests.
+// Register the host app's admin scripts before handling requests.
 // Memoized, so this only does work on the first request per process.
 router.use((_req, _res, next) => {
     bootstrapAdminScripts();
     next();
 });
 
+/**
+ * Translate a thrown error into an HTTP response. Boom errors (thrown by the
+ * schedule use cases) carry their own status code; anything else is an
+ * unexpected 500. Mirrors the framework's app-handler-helpers convention.
+ * @private
+ */
+function sendError(res, error, fallbackMessage) {
+    if (error.isBoom) {
+        return res.status(error.output.statusCode).json({ error: error.message });
+    }
+    console.error(fallbackMessage, error);
+    return res.status(500).json({ error: fallbackMessage });
+}
+
 /**
  * Build audit metadata for an execution from the request.
  * @private
@@ -62,11 +77,9 @@ function createScheduleUseCases() {
         process.env.SCHEDULER_PROVIDER ||
         (process.env.AWS_LAMBDA_FUNCTION_NAME ? null : 'local');
     if (!schedulerType) {
-        const error = new Error(
+        throw Boom.serverUnavailable(
             'SCHEDULER_PROVIDER is not configured. Set it (e.g. "aws") via appDefinition.admin.enableScheduling.'
         );
-        error.code = 'SCHEDULER_NOT_CONFIGURED';
-        throw error;
     }
 
     const schedulerAdapter = createSchedulerAdapter({
@@ -354,19 +367,7 @@ router.get('/scripts/:scriptName/schedule', async (req, res) => {
             ...result.schedule,
         });
     } catch (error) {
-        if (error.code === 'SCRIPT_NOT_FOUND') {
-            return res.status(404).json({
-                error: error.message,
-                code: error.code,
-            });
-        }
-        if (error.code === 'SCHEDULER_NOT_CONFIGURED') {
-            return res
-                .status(503)
-                .json({ error: error.message, code: error.code });
-        }
-        console.error('Error getting schedule:', error);
-        res.status(500).json({ error: 'Failed to get schedule' });
+        return sendError(res, error, 'Failed to get schedule');
     }
 });
 
@@ -397,25 +398,7 @@ router.put('/scripts/:scriptName/schedule', async (req, res) => {
             }),
         });
     } catch (error) {
-        if (error.code === 'SCRIPT_NOT_FOUND') {
-            return res.status(404).json({
-                error: error.message,
-                code: error.code,
-            });
-        }
-        if (error.code === 'INVALID_INPUT') {
-            return res.status(400).json({
-                error: error.message,
-                code: error.code,
-            });
-        }
-        if (error.code === 'SCHEDULER_NOT_CONFIGURED') {
-            return res
-                .status(503)
-                .json({ error: error.message, code: error.code });
-        }
-        console.error('Error updating schedule:', error);
-        res.status(500).json({ error: 'Failed to update schedule' });
+        return sendError(res, error, 'Failed to update schedule');
     }
 });
 
@@ -432,19 +415,7 @@ router.delete('/scripts/:scriptName/schedule', async (req, res) => {
 
         res.json(result);
     } catch (error) {
-        if (error.code === 'SCRIPT_NOT_FOUND') {
-            return res.status(404).json({
-                error: error.message,
-                code: error.code,
-            });
-        }
-        if (error.code === 'SCHEDULER_NOT_CONFIGURED') {
-            return res
-                .status(503)
-                .json({ error: error.message, code: error.code });
-        }
-        console.error('Error deleting schedule:', error);
-        res.status(500).json({ error: 'Failed to delete schedule' });
+        return sendError(res, error, 'Failed to delete schedule');
     }
 });