@bee.js/node 0.0.91 → 0.0.92

package/lib/beeHive/create.js

@@ -1,22 +1,10 @@
 const express = require("express");
-const bodyParser = require("body-parser");
 const log = require("./log");
-const headers = require("./headers");
 
 module.exports = function (configs) {
   const app = express();
-
-  app.use(
-    bodyParser.urlencoded({
-      limit: "10mb",
-      extended: true,
-      parameterLimit: 50000,
-    })
-  );
-  app.use(bodyParser.json({ extended: true, limit: "10mb" }));
-  app.use(bodyParser.raw());
-  app.use((req, res, next) => headers({ req, res, next, app, configs }));
-
+  app.express = express;
+    
   log(`Creating ${configs.name || "Bee.js"}...`);
   log("Optimizing model(s)...");
 

package/lib/beeHive/headers.js

@@ -1,24 +1,17 @@
-module.exports = function ({ next, app, configs = {} }) {
-  app.use((req, res, next) => {
-    if (!configs.headers) res.header("Access-Control-Allow-Origin", "*");
-
-    for (const key in configs.headers || {}) {
-      res.header(key, configs.headers[key]);
+module.exports = function ({ next, router, configs = {} }) {
+  router.use((req, res) => {
+    if (!configs.headers) {
+      res.header("Access-Control-Allow-Origin", "*");
+      res.header("Access-Control-Allow-Methods", "GET,POST,PUT,PATCH,DELETE,OPTIONS");
+      res.header("Access-Control-Allow-Headers", "Origin, X-Requested-With, Content-Type, Accept, Authorization");
     }
 
-    next();
-  });
-
-  // OPTIONS (preflight)
-  app.options("*", (req, res) => {
-    if (!configs.headers) res.header("Access-Control-Allow-Origin", "*");
+    if (req.method === "OPTIONS") return res.sendStatus(200);
 
     for (const key in configs.headers || {}) {
       res.header(key, configs.headers[key]);
     }
-
-    return res.sendStatus(200);
   });
 
   next();
-};
+};

package/lib/beeHive/routes.js

@@ -1,6 +1,8 @@
 const express = require("express");
 const log = require("./log");
 const route = require("../WEB/route");
+const bodyParser = require("body-parser");
+const headers = require("./headers");
 const freeRoute = require("../WEB/freeRoute");
 
 module.exports = function () {
@@ -9,7 +11,7 @@ module.exports = function () {
   const router = express.Router();
   const controllers = global.controllers;
 
-  global.routes?.map((r) => {
+  global.routes?.forEach((r) => {
     let controller =
       typeof r.controller !== "string"
         ? r.controller
@@ -23,13 +25,24 @@ module.exports = function () {
                 () => null);
           }, controllers);
 
-    !router[r.method || "get"]
-      ? console.log(`ERROR: method not found`, r)
-      : router[r.method || "get"](
-          r.route,
-          r.free ? freeRoute : route,
-          controller
-        );
+    if (!router[r.method || "get"]) return console.log(`ERROR: method not found`, r);
+
+    router[r.method || "get"](
+      r.route,
+      r.free ? freeRoute : route,
+      controller
+    );
+
+    router.use(
+      bodyParser.urlencoded({
+        limit: "10mb",
+        extended: true,
+        parameterLimit: 50000,
+      })
+    );
+    router.use(bodyParser.json({ extended: true, limit: "10mb" }));
+    router.use(bodyParser.raw());
+    router.use((req, res, next) => headers({ req, res, next, router, configs }));
   });
 
   log(`${Object.keys(global.routes).length} route(s)`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bee.js/node",
-  "version": "0.0.91",
+  "version": "0.0.92",
   "description": "A JavaScript framework for making Node.js API´s",
   "main": "index.js",
   "scripts": {