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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@scout9/app",
-  "version": "1.0.0-alpha.0.2.8",
+  "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

@@ -358,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}));
   }
@@ -399,55 +402,72 @@ async function runCommandApi(req, res) {
     file = files?.[0];
   } catch (e) {
     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);
   } 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);
@@ -517,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) {