@scout9/app 1.0.0-alpha.0.2.7 → 1.0.0-alpha.0.2.9

package/dist/{dev-170fa3f5.cjs → dev-73437873.cjs}

@@ -23,7 +23,7 @@ var Stream = require('node:stream');
 var node_string_decoder = require('node:string_decoder');
 var readline = require('node:readline');
 var process$2 = require('node:process');
-var macros = require("./macros-eff64992.cjs");
+var macros = require("./macros-44f1f872.cjs");
 var node_os = require('node:os');
 var promises = require('fs/promises');
 
@@ -35937,7 +35937,7 @@ function _loadUserPackageJson() {
           targetPkgUrl = isTest ? packageTestJsonUrl : packageJsonUrl;
           _context2.t0 = JSON;
           _context2.next = 10;
-          return fs__default["default"].readFile(new URL(targetPkgUrl, (typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __filename).href : (document.currentScript && document.currentScript.src || new URL('dev-170fa3f5.js', document.baseURI).href))), 'utf-8');
+          return fs__default["default"].readFile(new URL(targetPkgUrl, (typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __filename).href : (document.currentScript && document.currentScript.src || new URL('dev-73437873.js', document.baseURI).href))), 'utf-8');
         case 10:
           _context2.t1 = _context2.sent;
           pkg = _context2.t0.parse.call(_context2.t0, _context2.t1);

package/dist/{index-44e73470.cjs → index-08dc13e8.cjs}

@@ -1,8 +1,8 @@
 'use strict';
 
 var spirits = require("./spirits-76855e30.cjs");
-var dev = require("./dev-170fa3f5.cjs");
-var macros = require("./macros-eff64992.cjs");
+var dev = require("./dev-73437873.cjs");
+var macros = require("./macros-44f1f872.cjs");
 var require$$0 = require('fs');
 var require$$2$1 = require('events');
 var require$$1 = require('path');
@@ -29483,7 +29483,7 @@ class Body {
     }
     const {
       toFormData
-    } = await Promise.resolve().then(function () { return require("./multipart-parser-bd1fae8a.cjs"); });
+    } = await Promise.resolve().then(function () { return require("./multipart-parser-ca328d7d.cjs"); });
     return toFormData(this.body, ct);
   }
 
@@ -41892,7 +41892,7 @@ function _loadUserPackageJson() {
           targetPkgUrl = isTest ? packageTestJsonUrl : packageJsonUrl;
           _context.t0 = JSON;
           _context.next = 10;
-          return fs__default["default"].readFile(new URL(targetPkgUrl, (typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __filename).href : (document.currentScript && document.currentScript.src || new URL('index-44e73470.js', document.baseURI).href))), 'utf-8');
+          return fs__default["default"].readFile(new URL(targetPkgUrl, (typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __filename).href : (document.currentScript && document.currentScript.src || new URL('index-08dc13e8.js', document.baseURI).href))), 'utf-8');
         case 10:
           _context.t1 = _context.sent;
           pkg = _context.t0.parse.call(_context.t0, _context.t1);
@@ -43098,7 +43098,7 @@ var ProjectFiles = /*#__PURE__*/function () {
   return ProjectFiles;
 }();
 
-var __filename$1 = node_url.fileURLToPath((typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __filename).href : (document.currentScript && document.currentScript.src || new URL('index-44e73470.js', document.baseURI).href)));
+var __filename$1 = node_url.fileURLToPath((typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __filename).href : (document.currentScript && document.currentScript.src || new URL('index-08dc13e8.js', document.baseURI).href)));
 var __dirname$1 = path__default["default"].dirname(__filename$1);
 function zipDirectory(source, out) {
   var archive = archiver$1('tar', {
@@ -43313,7 +43313,7 @@ function _buildApp() {
         case 11:
           _context4.t0 = JSON;
           _context4.next = 14;
-          return fs__default["default"].readFile(new URL(templatePackagePath, (typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __filename).href : (document.currentScript && document.currentScript.src || new URL('index-44e73470.js', document.baseURI).href))), 'utf-8');
+          return fs__default["default"].readFile(new URL(templatePackagePath, (typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __filename).href : (document.currentScript && document.currentScript.src || new URL('index-08dc13e8.js', document.baseURI).href))), 'utf-8');
         case 14:
           _context4.t1 = _context4.sent;
           packageTemplate = _context4.t0.parse.call(_context4.t0, _context4.t1);

package/dist/index.cjs

@@ -2,10 +2,10 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var index = require("./index-44e73470.cjs");
-var dev = require("./dev-170fa3f5.cjs");
+var index = require("./index-08dc13e8.cjs");
+var dev = require("./dev-73437873.cjs");
 require("./spirits-76855e30.cjs");
-require("./macros-eff64992.cjs");
+require("./macros-44f1f872.cjs");
 require('fs');
 require('events');
 require('path');

package/dist/{macros-eff64992.cjs → macros-44f1f872.cjs}

@@ -4242,7 +4242,7 @@ var WorkflowResponseMessageApiResponse = z.union([z.string(), z.object({
 /**
  * The workflow response object slot
  */
-var InstructionSchema = z.union([z.string(), InstructionObjectSchema, z.array(z.string()), z.array(InstructionObjectSchema)]);
+var InstructionSchema = z.union([z.string(), InstructionObjectSchema, z.array(z.union([z.string(), InstructionObjectSchema]))]);
 
 /**
  * Base follow up schema to follow up with the client

package/dist/{multipart-parser-bd1fae8a.cjs → multipart-parser-ca328d7d.cjs}

@@ -2,9 +2,9 @@
 
 require('node:fs');
 require('node:path');
-var index = require("./index-44e73470.cjs");
+var index = require("./index-08dc13e8.cjs");
 require("./spirits-76855e30.cjs");
-require("./dev-170fa3f5.cjs");
+require("./dev-73437873.cjs");
 require('util');
 require('stream');
 require('path');
@@ -25,7 +25,7 @@ require('node:stream');
 require('node:string_decoder');
 require('node:readline');
 require('node:process');
-require("./macros-eff64992.cjs");
+require("./macros-44f1f872.cjs");
 require('node:os');
 require('fs/promises');
 require('constants');

package/dist/schemas.cjs

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var macros = require("./macros-eff64992.cjs");
+var macros = require("./macros-44f1f872.cjs");
 
 
 

package/dist/testing-tools.cjs

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var dev = require("./dev-170fa3f5.cjs");
+var dev = require("./dev-73437873.cjs");
 require("./spirits-76855e30.cjs");
 require('util');
 require('stream');
@@ -26,7 +26,7 @@ require('node:stream');
 require('node:string_decoder');
 require('node:readline');
 require('node:process');
-require("./macros-eff64992.cjs");
+require("./macros-44f1f872.cjs");
 require('node:os');
 require('fs/promises');
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@scout9/app",
-  "version": "1.0.0-alpha.0.2.7",
+  "version": "1.0.0-alpha.0.2.9",
   "description": "Build and deploy your Scout9 app for SMS auto replies",
   "publishConfig": {
     "access": "public"

package/src/core/templates/app.js

@@ -5,7 +5,8 @@ import bodyParser from 'body-parser';
 import colors from 'kleur';
 import { config as dotenv } from 'dotenv';
 import { Configuration, Scout9Api } from '@scout9/admin';
-import { EventResponse, WorkflowEventSchema, WorkflowResponseSchema } from '@scout9/app';
+import { EventResponse } from '@scout9/app';
+import { WorkflowEventSchema, WorkflowResponseSchema } from '@scout9/app/schemas';
 import path, { resolve } from 'node:path';
 import fs from 'node:fs';
 import https from 'node:https';
@@ -97,7 +98,7 @@ const handleError = (e, res = undefined) => {
   if ('stack' in e) {
     console.log(colors.grey(e.stack));
   }
-  console.log(colors)
+  console.log(colors);
   if (res) {
     res.writeHead(code, {'Content-Type': 'application/json'});
     res.end(JSON.stringify({
@@ -108,6 +109,31 @@ const handleError = (e, res = undefined) => {
   }
 };
 
+const handleZodError = ({error, res = undefined, code = 500, status, name, bodyLabel = 'Provided Input', body = undefined, action = ''}) => {
+  res?.writeHead?.(code, {'Content-Type': 'application/json'});
+  if (error instanceof ZodError) {
+    const formattedErrors = JSON.stringify(error.errors, null, 2);
+    res?.end?.(JSON.stringify({
+      status,
+      errors: formattedErrors
+    }));
+    console.log(colors.red(`${colors.bold(`${name}`)}:`));
+    if (body) {
+      console.log(colors.grey(`${bodyLabel}:`));
+      console.log(colors.grey(JSON.stringify(body, null, 2)));
+    }
+    console.log(colors.red(`${action}${formattedErrors}`));
+  } else {
+    console.error(error);
+    error.message = `${name}: ` + error.message;
+    res?.end?.(JSON.stringify({
+      status,
+      errors: [error.message]
+    }));
+    throw new Error(`${name}: Provided error was not a ZodError`);
+  }
+};
+
 const makeRequest = async (options, maxRedirects = 10) => {
   return new Promise((resolve, reject) => {
 
@@ -168,34 +194,49 @@ if (dev) {
 // Root application POST endpoint will run the scout9 app
 app.post(dev ? '/dev/workflow' : '/', async (req, res) => {
   let workflowEvent;
+
   try {
     workflowEvent = WorkflowEventSchema.parse(req.body.event);
     globalThis.SCOUT9 = {
       ...workflowEvent,
-      $convo: req.body.$convo,
-    }
+      $convo: req.body.$convo
+    };
   } catch (error) {
     if (error instanceof ZodError) {
-      const formattedErrors = error.format();
-      res.writeHead(400, {'Content-Type': 'application/json'});
-      res.end(JSON.stringify({
-        status: 'Invalid WorkflowEvent',
-        errors: formattedErrors
-      }));
-      console.log(colors.red(`${colors.bold(`Bad Input Event:`)}: Received: ${JSON.stringify(req.body.event, null, 2)}\n\nErrors:\n\n${JSON.stringify(formattedErrors, null, 2)}`));
+      handleZodError({
+        error,
+        name: 'Workflow Template Event Request Parse Error',
+        body: req.body.event,
+        bodyLabel: 'Provided WorkflowEvent',
+        code: 400,
+        res,
+        status: 'Invalid WorkflowEvent Input'
+      });
     } else {
       error.message = `Workflow Template Event Parse Error: ` + error.message;
       handleError(error, res);
     }
     return;
   }
+
   if (!workflowEvent) {
     handleError(new Error('No workflowEvent defined'), res);
   }
+  let response;
+  try {
+    response = await projectApp(workflowEvent);
+  } catch (error) {
+    error.message = `Workflow Template Runtime Error: ` + error.message;
+    handleError(error, res);
+    return;
+  }
+
+  if (!response) {
+    throw new Error('No response');
+  }
 
   try {
-    const response = await projectApp(workflowEvent);
-    const formattedResponse = WorkflowEventSchema.parse(response);
+    const formattedResponse = WorkflowResponseSchema.parse(response);
     if (dev) {
       console.log(colors.green(`Workflow Sending Response:`));
       console.log(colors.grey(JSON.stringify(formattedResponse, null, 2)));
@@ -204,15 +245,17 @@ app.post(dev ? '/dev/workflow' : '/', async (req, res) => {
     res.end(JSON.stringify(formattedResponse));
   } catch (error) {
     if (error instanceof ZodError) {
-      const formattedErrors = error.format();
-      res.writeHead(500, {'Content-Type': 'application/json'});
-      res.end(JSON.stringify({
-        status: 'Invalid WorkflowResponse',
-        errors: formattedErrors
-      }));
-      console.log(colors.red(`${colors.bold(`Input Workflow Response`)}: Fix needed\n\n${JSON.stringify(formattedErrors, null, 2)}`));
+      handleZodError({
+        error,
+        name: 'Workflow Template Event Response Parse Error',
+        body: response,
+        bodyLabel: 'Provided WorkflowResponse',
+        code: 500,
+        res,
+        status: 'Invalid WorkflowResponse Output'
+      });
     } else {
-      error.message = `Workflow Template Runtime Error: ` + error.message
+      error.message = `Workflow Template Runtime Parse Error: ` + error.message;
       handleError(error, res);
     }
   }
@@ -315,14 +358,17 @@ async function runEntityApi(req, res) {
       searchParams: req?.query || {}, body: req?.body || undefined,
       id: params.id
     });
-    if (response instanceof EventResponse && !!response.body) {
+    if (response instanceof EventResponse || !!response.body) {
+      const data = response.body ?? response.data();
       res.writeHead(response.status || 200, {'Content-Type': 'application/json'});
-      res.end(JSON.stringify(response.body));
+      res.end(JSON.stringify(data));
+      console.log(`${req.method} EntityApi.${params.id}:`);
+      console.log(colors.grey(JSON.stringify(data)));
     } else {
       throw new Error(`Invalid response: not an EventResponse`);
     }
   } catch (e) {
-    console.error(e);
+    console.error(`${req.method} EntityApi Runtime Error`, e.message);
     res.writeHead(500, {'Content-Type': 'application/json'});
     res.end(JSON.stringify({error: e.message}));
   }
@@ -330,7 +376,7 @@ async function runEntityApi(req, res) {
 
 async function getFilesRecursive(dir) {
   let results = [];
-  const list = await readdir(dir, { withFileTypes: true });
+  const list = await readdir(dir, {withFileTypes: true});
 
   for (const dirent of list) {
     const res = resolve(dir, dirent.name);
@@ -351,59 +397,77 @@ async function runCommandApi(req, res) {
   const commandsDir = resolve(__dirname, `./src/commands`);
 
   try {
-    const files = await getFilesRecursive(commandsDir).then(files => files.map(file => file.replace(commandsDir, '.')).filter(file => params.every(p => file.includes(p))))
+    const files = await getFilesRecursive(commandsDir).then(files => files.map(file => file.replace(commandsDir, '.'))
+      .filter(file => params.every(p => file.includes(p))));
     file = files?.[0];
   } catch (e) {
-    console.log('No commands found', e.message)
+    console.log('No commands found', e.message);
+    res.writeHead(404, {'Content-Type': 'application/json'});
+    res.end(JSON.stringify({error: `No commands found`}));
+    return;
   }
 
-
   if (!file) {
-    throw new Error(`Unable to find command for ${url}`);
+    res.writeHead(404, {'Content-Type': 'application/json'});
+    res.end(JSON.stringify({error: `Unable to find command for ${url}`}));
+    return;
   }
 
   let mod;
   try {
-    mod = await import(pathToFileURL(path.resolve(commandsDir, file)).href)
-    console.log(mod);
+    mod = await import(pathToFileURL(path.resolve(commandsDir, file)).href);
   } catch (e) {
     if ('code' in e) {
       switch (e.code) {
         case 'ERR_MODULE_NOT_FOUND':
         case 'MODULE_NOT_FOUND':
           console.error(e);
-          throw new Error(`Invalid command: no API method`);
+          res.writeHead(404, {'Content-Type': 'application/json'});
+          res.end(JSON.stringify({error: `Invalid command: no API method found`}));
+          return;
       }
     }
     console.error(e);
-    throw new Error(`Invalid command: Internal system error`);
+    res.writeHead(500, {'Content-Type': 'application/json'});
+    res.end(JSON.stringify({error: `Invalid command: Internal system error: ${e?.message ?? ''}`}));
+    return;
   }
 
   if (!mod || !mod.default) {
-    throw new Error(`Command file "${file}" does not export a default command function`);
+    res.writeHead(500, {'Content-Type': 'application/json'});
+    res.end(JSON.stringify({error: `Command file "${file}" does not export a default command function`}));
+    return;
   }
 
-  console.log(mod);
-
   let result;
 
   try {
     result = await mod.default(body);
   } catch (e) {
     console.error('Failed to run command', e);
-    throw new Error(`Failed to run command: ${e.message}`)
+    res.writeHead(500, {'Content-Type': 'application/json'});
+    res.end(JSON.stringify({error: `Failed to run command: ${e.message}`}));
+    return;
   }
 
+  let responseBody = {};
+  let code = 500;
   if (result) {
     if (typeof result === 'string') {
-      return {message: result};
+      responseBody = {message: result};
+      code = 200;
     } else if (typeof result === 'object' && 'message' in result) {
-      return result;
+      responseBody = result;
+      code = 200;
     } else {
-      throw new Error(`Invalid Command Response, must either return a string or {"message": "<your message>"}`);
+      responseBody.error = `Invalid Command Response, must either return a string or {"message": "<your message>"}`;
     }
+  } else {
+    responseBody.error = `No command response provided`;
   }
-  return {message: `${mod.default.name} Complete`};
+
+  res.writeHead(code, {'Content-Type': 'application/json'});
+  res.end(JSON.stringify(responseBody));
 }
 
 app.post('/commands/:command', runCommandApi);
@@ -473,7 +537,8 @@ if (dev) {
       for (const [key, value] of Object.entries(payload.context)) {
         fields += `\n\t\t${colors.bold(colors.white(key))}: ${colors.grey(JSON.stringify(value))}`;
       }
-      console.log(`\tParsed in ${payload.ms}ms:${colors.grey(`${fields}`)}`);
+      console.log(`\tParsed in ${payload.ms}ms:${colors.grey(`${fields}`)}:`);
+      console.log(colors.grey(JSON.stringify(payload)));
       res.writeHead(200, {'Content-Type': 'application/json'});
       res.end(JSON.stringify(payload));
     } catch (e) {

package/src/runtime/schemas/workflow.js

@@ -77,8 +77,11 @@ export const WorkflowResponseMessageApiResponse = z.union([
 /**
  * The workflow response object slot
  */
-export const InstructionSchema = z.union([z.string(), InstructionObjectSchema, z.array(z.string()), z.array(
-  InstructionObjectSchema)]);
+export const InstructionSchema = z.union([
+  z.string(),
+  InstructionObjectSchema,
+  z.array(z.union([z.string(), InstructionObjectSchema]))
+]);
 
 /**
  * Base follow up schema to follow up with the client