minimonolith 0.6.2 → 0.6.3

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "minimonolith",
   "type": "module",
-  "version": "0.6.2",
+  "version": "0.6.3",
   "main": "index.js",
   "license": "MIT",
   "scripts": {

package/src/server/lambdaServer.js

@@ -1,9 +1,9 @@
 import http from 'http';
 
-import { serverHandlerContext } from './serverHandler.js';
+import { getServerHandler } from './serverHandler.js';
 
-const runLambdaServer = (lambdaAPIHandler, port) => {
-  const serverHandler = serverHandlerContext(lambdaAPIHandler);
+const runLambdaServer = (lambdaHandler, port) => {
+  const serverHandler = getServerHandler(lambdaHandler);
   const server = http.createServer(serverHandler);
   server.listen(port);
 }

package/src/server/serverHandler.js

@@ -10,24 +10,39 @@ const reqBodyPromise = req => {
 }
 
 const parseJWT = token => {
-  const tokenString = JSON.parse(Buffer.from(token.split('.')[1], 'base64').toString());
-  return tokenString;
+  return JSON.parse(Buffer.from(token.split('.')[1], 'base64').toString());
 }
 
-const serverHandlerContext = lambdaAPIHandler => async (req, res) => {
+const putCORS = res => {
+  res.setHeader('Access-Control-Allow-Origin', '*');
+  res.setHeader('Access-Control-Request-Method', '*');
+  res.setHeader('Access-Control-Allow-Methods', 'OPTIONS,GET,POST,PUT,PATCH,DELETE');
+  res.setHeader('Access-Control-Allow-Headers', '*');
+};
+
+const getEvent = (req, queryString, token, body) => {
+  return {
+    path: req.url,
+    httpMethod: req.method,
+    queryStringParameters: queryString,
+    requestContext: {
+      http: { path: req.url, method: req.method, },
+      authorizer: { jwt: { claims: token }, },
+    },
+    headers: {
+      accept: req.headers.accept,
+      'User-Agent': req.headers['user-agent']
+    },
+    body,
+  };
+};
+
+const getServerHandler = lambdaHandler => async (req, res) => {
   try {
-    res.setHeader('Access-Control-Allow-Origin', '*');
-    res.setHeader('Access-Control-Request-Method', '*');
-    res.setHeader('Access-Control-Allow-Methods', 'OPTIONS,GET,POST,PUT,PATCH,DELETE');
-    res.setHeader('Access-Control-Allow-Headers', '*');
-    if (req.method === 'OPTIONS') {
-      res.writeHead(200);
-      res.end();
-      return;
-    }
+    putCORS(res);
+    if (req.method === 'OPTIONS') { res.writeHead(200); res.end(); return; }
 
-    const token =
-      req.headers.authorization && req.headers.authorization.startsWith('Bearer ') ?
+    const token = req.headers.authorization && req.headers.authorization.startsWith('Bearer ') ?
       parseJWT(req.headers.authorization.split(" ")[1]) : null;
 
     const tempQueryString = url.parse(req.url, true).query;
@@ -36,31 +51,12 @@ const serverHandlerContext = lambdaAPIHandler => async (req, res) => {
     const tempBody = await reqBodyPromise(req);
     const body = tempBody? tempBody : undefined;
 
-    const e = {
-      path: req.url,
-      httpMethod: req.method,
-      queryStringParameters: queryString,
-      requestContext: {
-        http: {
-          path: req.url,
-          method: req.method,
-        },
-        authorizer: {
-          jwt: { claims: token },
-        },
-      },
-      headers: {
-        accept: req.headers.accept,
-        'User-Agent': req.headers['user-agent']
-      },
-      body,
-    };
-
-    const resL = await lambdaAPIHandler(e, null)
+    const event = getEvent(req, queryString, token, body);
+    const resL = await lambdaHandler(event, null)
 
     res.statusCode = resL.statusCode;
     res.end(resL.body);
   } catch(err) { console.log(err); }
 }
 
-export { serverHandlerContext };
+export { getServerHandler };