@friggframework/devtools 2.0.0-next.4 → 2.0.0-next.6

package/frigg-cli/build-command/index.js

@@ -0,0 +1,27 @@
+const { spawn } = require('child_process');
+const path = require('path');
+
+function buildCommand(...args) {
+    console.log('Building the serverless application...');
+    const backendPath = path.resolve(process.cwd());
+    const infrastructurePath = 'infrastructure.js';
+    const command = 'serverless';
+    const serverlessArgs = ['package', '--config', infrastructurePath, ...args.filter(arg => arg !== 'build')];
+
+    const childProcess = spawn(command, serverlessArgs, {
+        cwd: backendPath,
+        stdio: 'inherit',
+    });
+
+    childProcess.on('error', (error) => {
+        console.error(`Error executing command: ${error.message}`);
+    });
+
+    childProcess.on('close', (code) => {
+        if (code !== 0) {
+            console.log(`Child process exited with code ${code}`);
+        }
+    });
+} 
+
+module.exports = { buildCommand };

package/frigg-cli/deploy-command/index.js

@@ -0,0 +1,27 @@
+const { spawn } = require('child_process');
+const path = require('path');
+
+function deployCommand(...args) {
+    console.log('Deploying the serverless application...');
+    const backendPath = path.resolve(process.cwd());
+    const infrastructurePath = 'infrastructure.js';
+    const command = 'serverless';
+    const serverlessArgs = ['deploy', '--config', infrastructurePath, ...args.filter(arg => arg !== 'deploy')];
+
+    const childProcess = spawn(command, serverlessArgs, {
+        cwd: backendPath,
+        stdio: 'inherit',
+    });
+
+    childProcess.on('error', (error) => {
+        console.error(`Error executing command: ${error.message}`);
+    });
+
+    childProcess.on('close', (code) => {
+        if (code !== 0) {
+            console.log(`Child process exited with code ${code}`);
+        }
+    });
+}
+
+module.exports = { deployCommand };

package/frigg-cli/index.js

@@ -3,6 +3,8 @@
 const { Command } = require('commander');
 const { installCommand } = require('./install-command');
 const { startCommand } = require('./start-command'); // Assuming you have a startCommand module
+const { buildCommand } = require('./build-command');
+const { deployCommand } = require('./deploy-command');
 
 const program = new Command();
 program
@@ -15,6 +17,16 @@ program
     .description('Run the backend and optional frontend')
     .action(startCommand);
 
+program
+    .command('build')
+    .description('Build the serverless application')
+    .action(buildCommand);
+
+program
+    .command('deploy')
+    .description('Deploy the serverless application')
+    .action(deployCommand);
+
 program.parse(process.argv);
 
-module.exports = { installCommand, startCommand };
+module.exports = { installCommand, startCommand, buildCommand, deployCommand };

package/infrastructure/backend-utils.js

@@ -2,7 +2,7 @@ const { createFriggBackend, Worker } = require('@friggframework/core');
 const {
     findNearestBackendPackageJson,
 } = require('../frigg-cli/utils/backend-path');
-const path = require('path');
+const path = require('node:path');
 const fs = require('fs-extra');
 
 const backendPath = findNearestBackendPackageJson();
@@ -32,7 +32,7 @@ const loadRouterFromObject = (IntegrationClass, routerObject) => {
             const integration = new IntegrationClass({});
             await integration.loadModules();
             await integration.registerEventHandlers();
-            const result = await integration.send(event, req.body);
+            const result = await integration.send(event, {req, res, next});
             res.json(result);
         } catch (error) {
             next(error);
@@ -43,9 +43,6 @@ const loadRouterFromObject = (IntegrationClass, routerObject) => {
 };
 const createQueueWorker = (integrationClass) => {
     class QueueWorker extends Worker {
-        constructor(params) {
-            super(params);
-        }
         async _run(params, context) {
             try {
                 let instance;

package/infrastructure/routers/integration-defined-routers.js

@@ -1,30 +1,35 @@
-const { createIntegrationRouter } = require('@friggframework/core');
 const { createAppHandler } = require('./../app-handler-helpers');
-const { requireLoggedInUser } = require('./middleware/requireLoggedInUser');
 const {
-    moduleFactory,
     integrationFactory,
-    IntegrationHelper,
     loadRouterFromObject,
 } = require('./../backend-utils');
 const { Router } = require('express');
 
 const handlers = {};
-integrationFactory.integrationClasses.forEach((IntegrationClass) => {
+for (const IntegrationClass of integrationFactory.integrationClasses) {
     const router = Router();
     const basePath = `/api/${IntegrationClass.Definition.name}-integration`;
-    IntegrationClass.Definition.routes.forEach((routeDef) => {
+    
+    console.log(`\n│ Configuring routes for ${IntegrationClass.Definition.name} Integration:`);
+
+    for (const routeDef of IntegrationClass.Definition.routes) {
         if (typeof routeDef === 'function') {
             router.use(basePath, routeDef(IntegrationClass));
+            console.log(`│ ANY ${basePath}/* (function handler)`);
         } else if (typeof routeDef === 'object') {
             router.use(
                 basePath,
                 loadRouterFromObject(IntegrationClass, routeDef)
             );
+            const method = (routeDef.method || 'ANY').toUpperCase();
+            const fullPath = `${basePath}${routeDef.path}`;
+            console.log(`│ ${method} ${fullPath}`);
         } else if (routeDef instanceof express.Router) {
             router.use(basePath, routeDef);
+            console.log(`│ ANY ${basePath}/* (express router)`);
         }
-    });
+    }
+    console.log('│');
 
     handlers[`${IntegrationClass.Definition.name}`] = {
         handler: createAppHandler(
@@ -32,6 +37,6 @@ integrationFactory.integrationClasses.forEach((IntegrationClass) => {
             router
         ),
     };
-});
+}
 
 module.exports = { handlers };

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@friggframework/devtools",
   "prettier": "@friggframework/prettier-config",
-  "version": "2.0.0-next.4",
+  "version": "2.0.0-next.6",
   "dependencies": {
     "@babel/eslint-parser": "^7.18.9",
     "@babel/parser": "^7.25.3",
     "@babel/traverse": "^7.25.3",
-    "@friggframework/core": "2.0.0-next.4",
-    "@friggframework/test": "2.0.0-next.4",
+    "@friggframework/core": "2.0.0-next.6",
+    "@friggframework/test": "2.0.0-next.6",
     "@hapi/boom": "^7.4.11",
     "@inquirer/prompts": "^5.3.8",
     "axios": "^1.7.2",
@@ -28,8 +28,9 @@
     "serverless-http": "^2.7.0"
   },
   "devDependencies": {
-    "@friggframework/eslint-config": "2.0.0-next.4",
-    "@friggframework/prettier-config": "2.0.0-next.4",
+    "@friggframework/eslint-config": "2.0.0-next.6",
+    "@friggframework/prettier-config": "2.0.0-next.6",
+    "serverless": "3.39.0",
     "serverless-dotenv-plugin": "^6.0.0",
     "serverless-offline": "^13.8.0",
     "serverless-offline-sqs": "^8.0.0",
@@ -57,5 +58,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "65ef3d8b5710609d4ce6813ae210714050759b53"
+  "gitHead": "14d7f856430f95bc0367246089713540e1c23a86"
 }