minimonolith 0.25.24 → 0.26.3

package/src/model/index.js

@@ -0,0 +1,4 @@
+import getSynced from './getSynced/index.js';
+import post from './post/index.js';
+
+export default { getSynced, post };

package/src/model/post/index.js

@@ -0,0 +1,16 @@
+import fs from 'fs';
+import url from 'url';
+
+import API_SERVICE from '../../api/index.js';
+import LOG_SERVICE from '../../log/index.js';
+const CYAN = '\x1b[36m', YELLOW = '\x1b[33m', END = '\x1b[0m';
+
+export default async (SERVICE_NAME, MODEL) => {
+  if (!MODEL) {
+      LOG_SERVICE.post('  MODEL_NOT_FOUND')
+      return;
+  }
+
+  LOG_SERVICE.post(`  + MODEL: ${CYAN}${SERVICE_NAME}${END}`)
+  API_SERVICE.get().SCHEMAS[SERVICE_NAME] = MODEL(SERVICE_NAME);
+}

package/{server → src/server}/getNodejsServerHandler/index.js

@@ -2,7 +2,9 @@
 
 import url from 'url';
 
-import CORS_HEADERS from '../../api/corsHeaders.js';
+import LOG_SERVICE from '../../log/index.js';
+
+import CORS_HEADERS from '../../middleware/postCors/corsHeaders.js';
 
 const getBody = req => {
   return new Promise((resolve, reject) => {
@@ -31,8 +33,7 @@ const getLambdaEvent = (req, queryString, jwtClaims, body) => {
     body,
   };
   
-  if (req.headers['content-type'])
-    event.headers['Content-Type'] = req.headers['content-type'];
+  if (req.headers['content-type']) event.headers['Content-Type'] = req.headers['content-type'];
   if (req.headers['x-trigger-error']) event.headers['x-trigger-error'] = 'TRUE';
   if (req.headers.accept) event.headers.accept = req.headers.accept;
   if (req.headers['user-agent']) event.headers['User-Agent'] = req.headers['user-agent'];
@@ -45,7 +46,9 @@ export default lambdaHandler => async (req, res) => {
     const authHeader = req.headers.authorization;
     const jwtClaims = authHeader?.startsWith('Bearer ') ? getJWTClaims(authHeader) : null;
 
-    const tempQueryString = url.parse(req.url, true).query;
+    //const tempQueryString = url.parse(req.url, true).query;
+    const parsedUrl = new URL(req.url, `http://${req.headers.host}`);
+    const tempQueryString = Object.fromEntries(parsedUrl.searchParams.entries());
     const queryString = tempQueryString ? tempQueryString : undefined;
 
     const tempBody = await getBody(req);
@@ -53,14 +56,17 @@ export default lambdaHandler => async (req, res) => {
 
     const lambdaEvent = getLambdaEvent(req, queryString, jwtClaims, body);
     const lambdaRes = await lambdaHandler(lambdaEvent, null)
+    console.log('lambdaRes', lambdaRes);
 
     res.statusCode = lambdaRes.statusCode;
-    for (let k in CORS_HEADERS) res.setHeader(k, CORS_HEADERS[k]);
+    for (let k in lambdaRes.headers) res.setHeader(k, lambdaRes.headers[k]);
+    //for (let k in CORS_HEADERS) res.setHeader(k, CORS_HEADERS[k]);
     res.end(lambdaRes.body);
+    console.log('got here');
 
   } catch(SERVER_ERROR) {
-    //LOG_SERVICE.post({ SERVER_ERROR });
-    console.error({ SERVER_ERROR });
+    console.log('got here2');
+    LOG_SERVICE.post({ SERVER_ERROR });
     res.statusCode = 500;
     for (let k in CORS_HEADERS) res.setHeader(k, CORS_HEADERS[k]);
     res.end(JSON.stringify({ REQUEST_PARSING_ERROR: SERVER_ERROR.toString() }));

package/src/server/getServerFactory/index.js

@@ -0,0 +1,12 @@
+import http from 'http';
+
+import getNodejsServerHandler from '../getNodejsServerHandler/index.js';
+
+export default async () => {
+
+  return (lambdaHandler) => {
+    const serverHandler = getNodejsServerHandler(lambdaHandler);
+    const server = http.createServer(serverHandler);
+    return server;
+  }
+}

package/src/server/index.js

@@ -0,0 +1,3 @@
+import getServerFactory from './getServerFactory/index.js';
+
+export default { getServerFactory };

package/api/api.js

@@ -1,5 +0,0 @@
-let API = undefined;
-
-export const setAPI = api => { API = api; };
-
-export default () => API;

package/api/getModels/handler.js

@@ -1,5 +0,0 @@
-import API from '../api.js';
-
-export default () => {
-    return API().MODELS;
-}

package/api/getModels/out.js

@@ -1,3 +0,0 @@
-import { z } from '@minimonolith/lib';
-
-export default () => z.unknown();

package/api/getNewAPI/handler.js

@@ -1,46 +0,0 @@
-import getLambdaAPI from 'lambda-api';
-
-import { getNewLib } from '@minimonolith/lib';
-
-import { setAPI } from '../api.js';
-
-import CORS_HEADERS from '../corsHeaders.js';
-
-export default async ({ body, SERVICES }) => {
-    //const LOG_LEVEL = body.LOG_LEVEL;
-    const LOG_LEVEL = body;
-
-    const API = {
-        ROUTES: getLambdaAPI(),
-        LIB: await getNewLib({ LOG_LEVEL }),
-        SCHEMAS: {},
-        MODELS: {},
-        ORM: undefined,
-    };
-
-    API.ROUTES.use((req, res, next) => {
-        if (req.headers['x-trigger-error']) {
-          const MESSAGE ={
-              ROUTE_CODE: 'LAMBDA_API',
-              MESSAGE: 'X_TRIGGER_ERROR_HEADER'
-          }
-          API.LIB.error(MESSAGE);
-          throw new Error(JSON.stringify(MESSAGE));
-        }
-        res.cors(); next();
-    });
-
-    API.ROUTES.options('/*', (req, res) => {
-        for (let k in CORS_HEADERS) { res.header(k, CORS_HEADERS[k]); }
-        res.status(200).send({})
-    });
-
-    API.postHealthService = SERVICES.health.post.handler;
-    API.postModule = SERVICES.api.postModule.handler;
-    API.postDatabaseService = SERVICES.database.post.handler;
-    API.getSyncedHandler =  SERVICES.api.getSyncedHandler.handler;
-
-    setAPI(API);
-
-    return API;
-};

package/api/getNewAPI/in.js

@@ -1,8 +0,0 @@
-import { z } from '@minimonolith/lib';
-
-export default () => z.number().default(2);
-/*
-export default () => ({
-    LOG_LEVEL: z.number().default(2),
-});
-*/

package/api/getNewAPI/out.js

@@ -1,3 +0,0 @@
-import { z } from '@minimonolith/lib';
-
-export default () => z.unknown();

package/api/getORM/handler.js

@@ -1,5 +0,0 @@
-import API from '../api.js';
-
-export default () => {
-    return API().ORM;
-}

package/api/getORM/out.js

@@ -1,3 +0,0 @@
-import { z } from '@minimonolith/lib';
-
-export default () => z.unknown();

package/api/getSchemas/handler.js

@@ -1,5 +0,0 @@
-import API from '../api.js';
-
-export default () => {
-    return API().SCHEMAS;
-}

package/api/getSchemas/out.js

@@ -1,3 +0,0 @@
-import { z } from '@minimonolith/lib';
-
-export default () => z.unknown();

package/api/getService/handler.js

@@ -1,8 +0,0 @@
-import API from '../api.js';
-
-export default ({ body }) => {
-    const moduleName = body.moduleName;
-    const serviceName = body.serviceName;
-
-    return API().LIB.SERVICES[moduleName][serviceName];
-}

package/api/getService/in.js

@@ -1,6 +0,0 @@
-import { z } from '@minimonolith/lib';
-
-export default () => ({
-    moduleName: z.string(),
-    serviceName: z.string(),
-});

package/api/getService/out.js

@@ -1,3 +0,0 @@
-import { z } from '@minimonolith/lib';
-
-export default () => z.unknown();

package/api/getServices/handler.js

@@ -1,5 +0,0 @@
-import API from '../api.js';
-
-export default ({ body }) => {
-    return API().LIB.SERVICES;
-}

package/api/getServices/out.js

@@ -1,3 +0,0 @@
-import { z } from '@minimonolith/lib';
-
-export default () => z.unknown();

package/api/getSyncedHandler/handler.js

@@ -1,28 +0,0 @@
-import getLambdaAPI from 'lambda-api';
-
-import API from '../api.js';
-
-export default async ({ body, ROUTE_CODE, SERVICES }) => {
-
-  API().ROUTES.use((err, req, res, next) => {
-    API().LIB.error({ ROUTE_CODE: 'LAMBDA_API', ERROR: err });
-    res.cors(); //next();
-    res.status(500).send({ ROUTE_CODE: 'LAMBDA_API', ERROR: err.message });
-  });
-
-  if (API().ORM) await SERVICES.model.getSynced.handler();
-
-  API().LIB.postAdditionalKey('MODELS', API().MODELS);
-
-  API().LIB.info({ ROUTE_CODE, INFO: 'LISTENING' });
-
-  return async (event, context) => {
-    API().LIB.info({
-      ROUTE_CODE: 'LAMBDA_EVENT',
-      PATH: event.requestContext?.http?.path,
-      METHOD: event.requestContext?.http?.method,
-    });
-
-    return await API().ROUTES.run(event, context);
-  };
-};

package/api/getSyncedHandler/in.js

@@ -1,3 +0,0 @@
-import { z } from '@minimonolith/lib';
-
-export default () => z.unknown();

package/api/getSyncedHandler/out.js

@@ -1,3 +0,0 @@
-import { z } from '@minimonolith/lib';
-
-export default () => z.function();

package/api/postDebug/handler.js

@@ -1,5 +0,0 @@
-import API from '../api.js';
-
-export default ({ body }) => {
-    API().LIB.debug(body);
-}

package/api/postDebug/in.js

@@ -1,3 +0,0 @@
-import { z } from '@minimonolith/lib';
-
-export default () => z.unknown();

package/api/postError/handler.js

@@ -1,5 +0,0 @@
-import API from '../api.js';
-
-export default ({ body }) => {
-    API().LIB.error(body);
-}

package/api/postError/in.js

@@ -1,3 +0,0 @@
-import { z } from '@minimonolith/lib';
-
-export default () => z.unknown();

package/api/postInfo/handler.js

@@ -1,5 +0,0 @@
-import API from '../api.js';
-
-export default ({ body }) => {
-    API()?.LIB.info(body);
-}

package/api/postInfo/in.js

@@ -1,3 +0,0 @@
-import { z } from '@minimonolith/lib';
-
-export default () => z.unknown();

package/api/postModel/handler.js

@@ -1,8 +0,0 @@
-import API from '../api.js';
-
-export default ({ body }) => {
-    const moduleName = body.moduleName;
-    const model = body.model;
-
-    API().MODELS[moduleName] = model;
-}

package/api/postModel/in.js

@@ -1,6 +0,0 @@
-import { z } from '@minimonolith/lib';
-
-export default () => ({
-    moduleName: z.string(),
-    model: z.unknown(),
-});

package/api/postModule/handler.js

@@ -1,31 +0,0 @@
-import fs from 'fs';
-import url from 'url'
-import path from 'path';
-
-import { PATH_MODULE } from '@minimonolith/lib';
-
-export default async ({ body, SERVICES }) => {
-    const moduleName = body.moduleName;
-    const srcFolder = body.srcFolder;
-    const modulesFolder = body.modulesFolder;
-
-    const projectRoot = PATH_MODULE.getProjectRoot(
-        import.meta.url, modulesFolder);
-    const projectRootPath = projectRoot + path.sep;
-    const projectRelativeServicePath = path.join('.',
-        srcFolder, moduleName) + path.sep;
-    //console.log('postmodule', srcFolder, projectRelativeServicePath);
-
-    await SERVICES.api.postRawModule.handler({
-        moduleName, srcFolder, modulesFolder });
-    const moduleURL = new URL(projectRelativeServicePath, projectRootPath);
-    //console.log('postmodule', moduleURL.href);
-    await SERVICES.model.post.handler({ moduleName, moduleURL });
-
-    const apiServices = await SERVICES.api.getServices.handler();
-    for (let serviceName in apiServices[moduleName]) {
-        const serviceCode = apiServices[moduleName][serviceName].code;
-        //console.log('POST_ROUTE', moduleName, serviceCode, apiServices);
-        await SERVICES.service.postRoute.handler({ moduleName, serviceCode });
-    }
-};

package/api/postModule/in.js

@@ -1,7 +0,0 @@
-import { z } from '@minimonolith/lib';
-
-export default () => ({
-    moduleName: z.string(),
-    srcFolder: z.string().default(''),
-    modulesFolder: z.string().default('node_modules'),
-});

package/api/postORM/handler.js

@@ -1,7 +0,0 @@
-import API from '../api.js';
-
-export default async ({ body }) => {
-    const ORM = body.ORM;
-
-    API().ORM = ORM;
-}

package/api/postORM/in.js

@@ -1,5 +0,0 @@
-import { z } from '@minimonolith/lib';
-
-export default () => ({
-    ORM: z.unknown(),
-});

package/api/postRawModule/handler.js

@@ -1,9 +0,0 @@
-import API from '../api.js';
-
-export default async ({ body }) => {
-    const moduleName = body.moduleName;
-    const srcFolder = body.srcFolder;
-    const modulesFolder = body.modulesFolder;
-
-    await API().LIB.postModule(moduleName, srcFolder, modulesFolder);
-};

package/api/postRawModule/in.js

@@ -1,9 +0,0 @@
-import path from 'path';
-
-import { z } from '@minimonolith/lib';
-
-export default () => ({
-    moduleName: z.string(),
-    srcFolder: z.string().default(''),
-    modulesFolder: z.string().default('node_modules' + path.sep),
-});

package/api/postRoute/handler.js

@@ -1,9 +0,0 @@
-import API from '../api.js';
-
-export default ({ body }) => {
-    const method = body.method;
-    const route = body.route;
-    const handler = body.handler;
-
-    API().ROUTES[method](route, handler);
-}

package/api/postRoute/in.js

@@ -1,7 +0,0 @@
-import { z } from '@minimonolith/lib';
-
-export default () => ({
-    method: z.string(),
-    route: z.string(),
-    handler: z.function(),
-})

package/api/postSchema/handler.js

@@ -1,8 +0,0 @@
-import API from '../api.js';
-
-export default async ({ body }) => {
-    const moduleName = body.moduleName;
-    const moduleSchema = body.moduleSchema;
-
-    API().SCHEMAS[moduleName] = moduleSchema;
-}

package/api/postSchema/in.js

@@ -1,6 +0,0 @@
-import { z } from '@minimonolith/lib';
-
-export default () => ({
-    moduleName: z.string(),
-    moduleSchema: z.unknown(),
-});

package/api/services.js

@@ -1,18 +0,0 @@
-export default [
-    'getNewAPI',
-    'getSyncedHandler',
-    'postModule',
-    'getService',
-    'getServices',
-    'getORM',
-    'getModels',
-    'getSchemas',
-    'postRoute',
-    'postRawModule',
-    'postSchema',
-    'postORM',
-    'postModel',
-    'postInfo',
-    'postDebug',
-    'postError',
-];

package/autotest/getMethodTest/in.js

@@ -1,3 +0,0 @@
-import { z } from '@minimonolith/lib';
-
-export default () => z.unknown();

package/autotest/getMethodTest/out.js

@@ -1,3 +0,0 @@
-import { z } from '@minimonolith/lib';
-
-export default () => z.function();

package/autotest/services.js

@@ -1 +0,0 @@
-export default ['getMethodTest'];

package/control/get/handler.js

@@ -1,8 +0,0 @@
-export default async ({ body }) => {
-    const SERVICE_NAME = body.SERVICE_NAME;
-    const MODULE_URL = body.MODULE_URL;
-
-    const handler = (await import(new URL(`${SERVICE_NAME}/index.js`,
-        MODULE_URL))).default;
-    return handler;
-}

package/control/get/in.js

@@ -1,6 +0,0 @@
-import { z } from '@minimonolith/lib';
-
-export default () => ({
-    SERVICE_NAME: z.string(),
-    MODULE_URL: z.string(),
-})

package/control/get/out.js

@@ -1,3 +0,0 @@
-import { z } from '@minimonolith/lib';
-
-export default () => z.unknown();

package/database/post/handler.js

@@ -1,24 +0,0 @@
-import Sequelize from 'sequelize';
-//import SequelizeDynamo from 'dynamo-sequelize';
-
-export default async ({ body, SERVICES, ROUTE }) => {
-    const dialect = body.dialect;
-    const host = body.host;
-    const port = body.port;
-    const user = body.user;
-    const pass = body.pass;
-    const db = body.db;
-    const storage = body.storage;
-
-    const SEQUELIZE_OPTIONS = { dialect, host, port, storage, logging: false };
-
-    //await SERVICES.api.postDebug.handler({
-    //    'SEQUELIZE_OPTIONS': SEQUELIZE_OPTIONS });
-
-    await SERVICES.api.postDebug.handler({ ROUTE, DB_VARS: {
-      dialect, host, port, db, user, pass, storage }});
-
-    const ORM = new Sequelize(db, user, pass, SEQUELIZE_OPTIONS);
-    await SERVICES.api.postORM.handler({ ORM });
-    await SERVICES.database.postConnection.handler({ ORM });
-};

package/database/post/in.js

@@ -1,12 +0,0 @@
-import { z } from '@minimonolith/lib';
-
-export default ({ MODELS }) => ({
-    dialect: z.enum(['sqlite', 'mysql', 'mariadb', 'postgres',
-        'mssql', 'snowflake', 'oracle']).default('sqlite'),
-    host: z.string().optional(),
-    user: z.string().optional(),
-    pass: z.string().optional(),
-    port: z.number().optional(),
-    db: z.string().optional(),
-    storage: z.string().default(':memory:'),
-});

package/database/postConnection/handler.js

@@ -1,25 +0,0 @@
-export default async ({ body, ROUTE_CODE, SERVICES }) => {
-    const ORM = body.ORM;
-
-    const MAX_RETRIES = 5, INITIAL_WAIT = 100;
-    let connectionRetries = 0, waitTime = INITIAL_WAIT;
-
-    while (connectionRetries < MAX_RETRIES) {
-        try {
-            await SERVICES.api.postInfo.handler({
-                ROUTE_CODE, AUTH_INTENT: connectionRetries });
-            await ORM.authenticate();
-            break;
-
-        } catch (META_METHOD_ERROR) {
-            await new Promise(resolve => setTimeout(resolve, waitTime));
-
-            connectionRetries += 1;
-            const jitter = Math.random() * 0.3 + 0.7;
-            waitTime = Math.min(2 * waitTime * jitter,
-                INITIAL_WAIT * Math.pow(2, MAX_RETRIES));
-        }
-    }
-
-    return connectionRetries;
-};

package/database/postConnection/in.js

@@ -1,5 +0,0 @@
-import { z } from '@minimonolith/lib';
-
-export default ({ MODELS }) => ({
-    ORM: z.unknown(),
-});

package/database/postConnection/out.js

@@ -1,3 +0,0 @@
-import { z } from '@minimonolith/lib';
-
-export default ({ MODELS }) => z.number();

package/database/services.js

@@ -1 +0,0 @@
-export default ['post', 'postConnection'];

package/environment/getDBEnvVars/handler.js

@@ -1,6 +0,0 @@
-export default envVars => {
-  const DB_ENV_VARS = ['DB_DIALECT', 'DB_HOST', 'DB_PORT', 'DB_DB',
-      'DB_USER', 'DB_PASS', 'DB_STORAGE'];
-  return Object.fromEntries(Object.entries(envVars).filter(
-      ([envVar]) => DB_ENV_VARS.includes(envVar)));
-}

package/environment/getDBEnvVars/in.js

@@ -1,3 +0,0 @@
-import { z } from '@minimonolith/lib';
-
-export default () => z.array(z.string());

package/environment/getDBEnvVars/out.js

@@ -1,3 +0,0 @@
-import { z } from '@minimonolith/lib';
-
-export default () => z.unknown();

package/environment/getENVEnvVars/handler.js

@@ -1,7 +0,0 @@
-export default ({ body }) => {
-    const envVars = body.envVars;
-
-    const API_ENV_VARS = ['DEV_ENV', 'PROD_ENV', 'TEST_ENV'];
-    return Object.fromEntries(Object.entries(envVars).filter(
-        ([envVar]) => API_ENV_VARS.includes(envVar)));
-}

package/environment/getENVEnvVars/in.js

@@ -1,3 +0,0 @@
-export default () => ({
-    envVars: z.unknown(),
-})

package/environment/getENVEnvVars/out.js

@@ -1,3 +0,0 @@
-import { z } from '@minimonolith/lib';
-
-export default () => z.unknown();

package/environment/postEnvFile/handler.js

@@ -1,16 +0,0 @@
-import path from 'path';
-import url from 'url';
-import dotenv from 'dotenv';
-
-import { PATH_MODULE } from '@minimonolith/lib';
-
-export default async ({ body }) => {
-  const envFile = body.envFile;
-  const modulesFolder = body.modulesFolder;
-
-  const projectRootFileUrl = PATH_MODULE.getProjectRoot(
-      import.meta.url, modulesFolder);
-  const projectRootPath = url.fileURLToPath(projectRootFileUrl + path.sep);
-  const envFilePath = path.resolve(projectRootPath, envFile)
-  dotenv.config({ path: envFilePath });
-};

package/environment/postEnvFile/in.js

@@ -1,6 +0,0 @@
-import { z } from '@minimonolith/lib';
-
-export default () => ({
-    envFile: z.string(),
-    modulesFolder: z.string(),
-})