@foxtware/mineral 0.1.5 → 0.1.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@foxtware/mineral",
-  "version": "0.1.5",
+  "version": "0.1.7",
   "bin": {
     "mineral": "bin/mineral.js"
   },
@@ -9,7 +9,7 @@
     "access": "public"
   },
   "scripts": {
-    "creds_to_env": "node _build_scripts/copyCredsToEnv.js",
+    "creds_to_env": "node hosting/copyCredsToEnv.js",
     "dev": "node --watch --watch-path=./api --watch-path=./server.js --watch-path=./server.utils.js --watch-path=./.creds.yml server.js",
     "new": "node _build_scripts/createNewFunction.js",
     "serve": "PORT=8100 node server.js",

package/server.js

@@ -3,8 +3,8 @@ const http = require('http');
 const { respondJson, errorToReadable, getRequestBody, argsFromBody, funcApi, statusCodeFromResult } = require('./server.utils');
 const { getWorkspace, setWorkspace, loadWorkspaceEnv, toAbsolutePath } = require('./api/workspace');
 const { getApiDirs, readCliFlag } = require('./cli');
-const { getFuncApiConfig } = require('./hosting.utils');
-const { MINERAL_API_DIR, getRequirePathForHandler } = require('./handlerPaths');
+const { getFuncApiConfig } = require('./hosting/hosting.utils');
+const { MINERAL_API_DIR } = require('./hosting/handlerPaths');
 
 const getConfig = (options = {}) => ({
   port: Number(options.port ?? process.env.PORT ?? 8000),
@@ -78,8 +78,6 @@ const directoriesToScan = ({
   return [MINERAL_API_DIR, ...extraDirs];
 };
 
-const getFuncApiConfigFromModule = getFuncApiConfig;
-
 const addHandlerFromFile = (filePath, handlers) => {
   const moduleExports = require(filePath);
   if (!moduleExports || typeof moduleExports !== 'object') {
@@ -92,7 +90,7 @@ const addHandlerFromFile = (filePath, handlers) => {
     return;
   }
 
-  const funcApiConfig = getFuncApiConfigFromModule({
+  const funcApiConfig = getFuncApiConfig({
     moduleExports,
     routeName,
   });
@@ -219,7 +217,6 @@ const startServer = (options = {}) => {
 module.exports = {
   startServer,
   loadHandlers,
-  getRequirePathForHandler,
   MINERAL_API_DIR,
   get server() {
     if (!server) {

package/server.utils.js

@@ -1,8 +1,9 @@
 const { logDeep } = require('./api/utils');
+const { HOSTED } = require('./api/constants');
 const { StringDecoder } = require('string_decoder');
 
 const respondJson = (res, statusCode, payload) => {
-  logDeep(payload);
+  !HOSTED && logDeep(payload);
   const body = JSON.stringify(payload);
   res.writeHead(statusCode, {
     'Content-Type': 'application/json',
@@ -120,15 +121,48 @@ const runRequestHandler = async (requestHandler, requestContext) => {
   return mergeRequestContext(requestContext, handlerOutput);
 };
 
-const wrapFunction = (func, wrappers = []) => async (req, res, ...rest) => {
-  for (const wrapper of wrappers) {
-    const rejected = await wrapper(req, res);
-    if (rejected) {
-      return rejected;
+const wrapFunction = (func, {
+  beforeWrappers = [],
+  afterWrappers = [],
+} = {}) => async (req, res, ...rest) => {
+  for (const beforeWrapper of beforeWrappers) {
+    const beforeResult = await beforeWrapper(req, res);
+    if (beforeResult?.handled) {
+      return;
+    }
+    if (beforeResult) {
+      return beforeResult;
+    }
+  }
+
+  if (!afterWrappers.length) {
+    return func(req, res, ...rest);
+  }
+
+  let result;
+
+  try {
+    result = await func(req, res, ...rest);
+  } catch (error) {
+    result = {
+      ok: false,
+      error: {
+        code: 'UNHANDLED_ERROR',
+        message: 'Unhandled server error.',
+        details: errorToReadable(error),
+      },
+    };
+  }
+
+  for (const afterWrapper of afterWrappers) {
+    try {
+      await afterWrapper(req, res, result);
+    } catch (error) {
+      console.log('wrapFunction afterWrapper error', error);
     }
   }
 
-  return func(req, res, ...rest);
+  return result;
 };
 
 const statusCodeFromResult = (result) => {

package/_build_scripts/copyCredsToEnv.js

@@ -1,45 +0,0 @@
-const fs = require('fs').promises;
-const path = require('path');
-const yaml = require('yaml');
-
-const mineralRoot = path.join(__dirname, '..');
-const credsYmlPath = path.join(mineralRoot, '.creds.yml');
-const envPath = path.join(mineralRoot, '.env');
-
-(async () => {
-  const credsText = await fs.readFile(credsYmlPath, 'utf8');
-  const credsFromYml = yaml.parse(credsText);
-  const credsJsonString = JSON.stringify(credsFromYml);
-  const newCredsLine = `CREDS=${ credsJsonString }`;
-
-  let envFileContents = '';
-  try {
-    envFileContents = await fs.readFile(envPath, 'utf8');
-  } catch (err) {
-    if (err.code !== 'ENOENT') {
-      throw err;
-    }
-  }
-
-  if (!envFileContents) {
-    await fs.writeFile(envPath, `${ newCredsLine }\n`);
-    console.log('Created .env with CREDS');
-    return;
-  }
-
-  if (/^CREDS=/m.test(envFileContents)) {
-    const updatedFileContents = envFileContents.replace(/^CREDS=.*$/m, newCredsLine);
-
-    if (updatedFileContents === envFileContents) {
-      console.log('CREDS already up to date');
-      return;
-    }
-
-    await fs.writeFile(envPath, updatedFileContents);
-    console.log('Updated CREDS in .env');
-    return;
-  }
-
-  await fs.appendFile(envPath, `\n\n${ newCredsLine }\n`);
-  console.log('Appended CREDS to .env');
-})();

package/_deploy_scripts/generateHosted.js

@@ -1,58 +0,0 @@
-const fs = require('fs');
-const { wrapHostedFunction } = require('../hosting.utils');
-
-const formatResolvedWrapperForHostedJs = ({ modulePath, wrapperName }) => (
-  `require('${ modulePath }').${ wrapperName }`
-);
-
-const formatWrappersArg = (resolvedWrappers = []) => {
-  if (!resolvedWrappers.length) {
-    return '';
-  }
-
-  const wrapperLines = resolvedWrappers.map((resolvedWrapper) => (
-    `    ${ formatResolvedWrapperForHostedJs(resolvedWrapper) },`
-  ));
-  return `, [\n${ wrapperLines.join('\n') }\n  ]`;
-};
-
-const generateHostedJs = ({
-  hostedHandlers,
-}) => {
-  const exportLines = [];
-
-  for (const hostedHandler of hostedHandlers) {
-    const { hostedName, handlerName, resolvedWrappers = [], requirePath } = hostedHandler;
-    const wrappersArg = formatWrappersArg(resolvedWrappers);
-
-    exportLines.push(
-      `  ${ hostedName }: wrapHostedFunction(() => require('${ requirePath }'), '${ handlerName }'${ wrappersArg }),`,
-    );
-  }
-
-  return `// Generated by mineral — do not edit
-const { wrapHostedFunction } = require('@foxtware/mineral/hosting.utils');
-
-module.exports = {
-${ exportLines.join('\n') }
-};
-`;
-};
-
-const writeHostedJs = ({
-  workspace,
-  hostedHandlers,
-}) => {
-  const hostedPath = `${ workspace.replace(/\/$/, '') }/hosted.js`;
-  const content = generateHostedJs({
-    hostedHandlers,
-  });
-
-  fs.writeFileSync(hostedPath, content);
-  return hostedPath;
-};
-
-module.exports = {
-  generateHostedJs,
-  writeHostedJs,
-};