@misterzik/espressojs 3.1.15 → 3.1.17

package/.env

@@ -1,6 +1,3 @@
-MONGO_URI=USER:PASSWORD@DOMAIN.mongodb.net
-MONGO_URI_PORT=27017
-MONGO_URI_DB=clients
-API_URI_ON=FALSE
-API_URI=
-PORT=8080
+MONGO_USER=USER
+MONGO_TOKEN=PASSWORD
+API_TOKEN=APITOKEN

package/README.md

@@ -2,11 +2,13 @@
 
 ## EspressoJS / Espresso
 
-### EspressoJS / Espresso is your one-stop Express Configuration starting point or boilerplate. Simple, and unopinionated, EspressoJS plug-and-play configurations are based on Express. Espresso will get you started with an Express instance in seconds.
+### Introducing Espresso.JS, your ultimate Express configuration starting point and boilerplate. With its simplicity and lack of opinionation, EspressoJS offers plug-and-play configurations built on top of Express.
+
+### Whether you're a beginner or an experienced developer, EspressoJS will have you up and running with an Express instance in a matter of seconds. Say goodbye to tedious setup and hello to streamlined development with EspressoJS.
 
 ## Getting Started
 
-- Download [latest release](https://github.com/misterzik/Espresso.js/packages/364567)
+- Download [latest release](https://github.com/misterzik/Espresso.js/releases)
 
   `npm install --save @misterzik/espressojs`
 
@@ -14,20 +16,32 @@
 
   ```
   {
-    "instance":"global",
-    "port":8080
+    "instance": "development",
+    "port": 8080,
+    "hostname": "",
+    "mongoDB": {
+      "enabled": false,
+      "uri": "",
+      "instance": "database"
+    },
+    "api": {
+      "enabled": false,
+      "uri": "https://swapi.dev/api/people/",
+      "url": "",
+      "method": "GET",
+      "headers": {
+        "Content-Type": "application/json"
+      }
+    }
   }
   ```
 
 - Create `.env` if you don't want to use config. A mix is possible.
 
   ```
-  MONGO_URI=USER:PASSWORD@DOMAIN.mongodb.net
-  MONGO_URI_PORT=27017
-  MONGO_URI_DB=clients
-  API_URI_ON=FALSE
-  API_URI=
-  PORT=8080
+  MONGO_USER=USER
+  MONGO_TOKEN=PASSWORD
+  API_TOKEN=APITOKEN
   ```
 
 - Create `espresso.js` and add the following requirements to call the packages.
@@ -47,14 +61,13 @@
   node cli run
   ```
 
-
 ### Structured Files
 
-  Pre-made Configurations:
+Pre-made Configurations:
 
-  - `server/config/config.global.js`
-  - `server/config/config.production.js`
-  - `server/config/config.development.js`
+- `server/config/config.global.js`
+- `server/config/config.production.js`
+- `server/config/config.development.js`
 
 ### Commands
 
@@ -62,5 +75,7 @@
 
 ### Requirements
 
+Installed prior using Espresso.JS
+
 - NodeJS
 - NPM

package/cli.js

@@ -1 +1,2 @@
-require("./server/utils/espresso-cli");
+const cli = require("./server/utils/espresso-cli");
+module.exports = cli;

package/config.json

@@ -1 +1,20 @@
-{ "instance": "global", "port": 8080 }
+{
+  "instance": "development",
+  "port": 8080,
+  "hostname": "",
+  "mongoDB": {
+    "enabled": false,
+    "port": null,
+    "uri": "",
+    "instance": "database"
+  },
+  "api": {
+    "enabled": false,
+    "uri": "https://swapi.dev/api/people/",
+    "url": "",
+    "method": "GET",
+    "headers": {
+      "Content-Type": "application/json"
+    }
+  }
+}

package/index.js

@@ -1,49 +1,50 @@
-/**
- * EspressoJS - Hippie's Fav Server Plate
- * Powered by Vimedev.com Labs
- * ----------------
+/*
+ * _|      _|  _|      _|  _|_|_|
+ * _|      _|  _|_|  _|_|  _|    _|
+ * _|      _|  _|  _|  _|  _|    _|
+ *   _|  _|    _|      _|  _|    _|
+ *     _|      _|      _|  _|_|_|
+ * EspressoJS - EspressoJS / Espresso
  * Express Plug & Play Server
  * -----------------
  * @param {*} app - EspressoJS by Vimedev.com Labs
  */
-
-const fs = require("fs");
 require("dotenv").config();
 const express = require("express");
 const app = express();
 const cfg = require("./server");
-const configBuffer = fs.readFileSync("./config.json"),
-  configJSON = configBuffer.toString(),
-  configData = JSON.parse(configJSON);
-
-const Path = require("path"),
-  Cors = require("cors"),
-  Compression = require("compression"),
-  Favicon = require("serve-favicon"),
-  Static = require("serve-static"),
-  Port = configData.port || process.env.PORT || cfg.port,
-  Routes = require("./routes/index");
+const { readConfigFile } = require("./server/utils/config.utils");
+const configData = readConfigFile();
 
+const Path = require("path");
+const Cors = require("cors");
+const Compression = require("compression");
+const Favicon = require("serve-favicon");
+const Static = require("serve-static");
 const mongoose = require("mongoose");
-const setCustomCacheControl = (res, path) => {
-  if (Static.mime.lookup(path) === "text/html") {
-    res.setHeader("Cache-Control", "public, max-age=0");
-  }
-};
+const Routes = require("./routes/index");
+
+const Port = configData.port || cfg.port;
+const mongoConfig = configData.mongo;
+
+if (configData.mongo_isEnabled) {
+  const {
+    uri: mongoUri = configData.mongo.uri || "",
+    port: mongoPort = configData.mongo.port || "",
+    db: mongoDb = configData.mongo.db || "",
+  } = mongoConfig;
+  const hasPort = mongoPort ? `:${mongoPort}/` : "/";
+  const url = `mongodb+srv://${
+    process.env.MONGO_USER +
+    ":" +
+    process.env.MONGO_TOKEN +
+    "@" +
+    mongoUri 
+    +
+    hasPort +
+    mongoDb
+  }`;
 
-if (cfg.mongo_isEnabled == true) {
-  let hasPort, hasUri;
-  if (cfg.mongo.port == "") {
-    hasPort = "/";
-  } else {
-    hasPort = ":" + cfg.mongo.port + "/";
-  }
-  if (cfg.mongo.uri == "") {
-    hasUri = process.env.MONGO_URI;
-  } else {
-    hasUri = cfg.mongo.uri;
-  }
-  const url = `mongodb+srv://${hasUri + hasPort + cfg.mongo.db}`;
   mongoose.Promise = global.Promise;
   mongoose
     .connect(url, {
@@ -51,10 +52,16 @@ if (cfg.mongo_isEnabled == true) {
       useNewUrlParser: true,
       promiseLibrary: require("bluebird"),
     })
-    .then(() => console.log(":: DB Connection succesful ::"))
+    .then(() => console.log(":: DB Connection successful ::"))
     .catch((err) => console.error(err));
 }
 
+const setCustomCacheControl = (res, path) => {
+  if (Static.mime.lookup(path) === "text/html") {
+    res.setHeader("Cache-Control", "public, max-age=0");
+  }
+};
+
 app.use(Compression());
 app.use(Cors());
 app.use(express.urlencoded({ extended: false }));
@@ -70,5 +77,8 @@ app.use(
 );
 
 Routes(app);
-app.listen(Port);
+app.listen(Port, () => {
+  console.log(`Server is running on port ${Port}`);
+});
+
 module.exports = app;

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@misterzik/espressojs",
-    "version": "3.1.15",
-    "description": "EspressoJS / Espresso is your one-stop Express Configuration starting point or boilerplate. Simple, and unopinionated, EspressoJS plug-and-play configurations are based on Express. Espresso will get you started with an Express instance in seconds.",
+    "version": "3.1.17",
+    "description": "EspressoJS Introducing Espresso.JS, your ultimate Express configuration starting point and boilerplate. With its simplicity and lack of opinionation, EspressoJS offers plug-and-play configurations built on top of Express.",
     "main": "index.js",
     "scripts": {
         "test": "echo \"Error: no test specified\"",
@@ -36,24 +36,24 @@
     },
     "homepage": "https://github.com/misterzik/Espresso.js#readme",
     "dependencies": {
-        "axios": "^0.24.0",
+        "axios": "^1.4.0",
         "bluebird": "^3.7.2",
         "cross-env": "^7.0.3",
-        "express": "^4.17.1",
-        "mongoose": "^5.13.13",
-        "dotenv": "^10.0.0",
+        "express": "^4.18.2",
+        "mongoose": "^7.3.0",
+        "dotenv": "^16.3.1",
         "cors": "^2.8.5",
-        "finalhandler": "^1.1.2",
+        "finalhandler": "^1.2.0",
         "compression": "^1.7.4",
-        "serve-static": "^1.14.1",
+        "serve-static": "^1.15.0",
         "serve-favicon": "^2.5.0",
-        "yargs": "^17.2.1"
+        "yargs": "^17.7.2"
     },
     "devDependencies": {
-        "debug": "^4.1.1",
-        "@babel/core": "^7.16.0",
+        "debug": "^4.3.4",
+        "@babel/core": "^7.22.5",
         "amd-define-factory-patcher-loader": "^1.0.0",
-        "babel-loader": "^8.2.3",
+        "babel-loader": "^9.1.2",
         "babel-preset-env": "^1.7.0"
     },
     "engines": {

package/routes/api/index.js

@@ -1,9 +1,10 @@
-/**
- * EspressoJS - Hippie's Fav Server Plate
- * Powered by Vimedev.com Labs
- * ----
- * API Routers
- * ---
+/*
+ * _|      _|  _|      _|  _|_|_|
+ * _|      _|  _|_|  _|_|  _|    _|
+ * _|      _|  _|  _|  _|  _|    _|
+ *   _|  _|    _|      _|  _|    _|
+ *     _|      _|      _|  _|_|_|
+ * EspressoJS - API Routers
  */
 
 const express = require("express");
@@ -13,7 +14,7 @@ const configuration = require("../../server");
 
 const getAPI = (req, res) => {
   axios
-    .get(configuration.swapi.uri, configuration.swapi.configs)
+    .get(configuration.api.uri, configuration.api.configs)
     .then(function (response) {
       if (response.status == 200) {
         res.json(response.data);
@@ -26,11 +27,11 @@ const getAPI = (req, res) => {
 
 const getItem = (req, res, params) => {
   axios
-    .get(configuration.swapi.uri + "/" + params, configuration.swapi.configs)
+    .get(configuration.api.uri + "/" + params, configuration.api.configs)
     .then(function (response) {
-      if (response.status == 200) {
+      if (response.status === 200) {
         res.json(response.data);
-      } else if (response.status == 400) {
+      } else if (response.status === 400) {
         res.json({ message: "400" });
       }
     })
@@ -40,13 +41,13 @@ const getItem = (req, res, params) => {
 const getItemId = (req, res, params, paramsId) => {
   axios
     .get(
-      configuration.swapi.uri + params + "/" + paramsId + "/",
-      configuration.swapi.configs
+      configuration.api.uri + params + "/" + paramsId + "/",
+      configuration.api.configs
     )
     .then(function (response) {
-      if (response.status == 200) {
+      if (response.status === 200) {
         res.json(response.data);
-      } else if (response.status == 400) {
+      } else if (response.status === 400) {
         res.json({ message: "400" });
       }
     })

package/routes/db/index.js

@@ -1,39 +1,34 @@
-/**
- * EspressoJS - Hippie's Fav Server Plate
- * Powered by Vimedev.com Labs
- * ---
- * Client Model - WIP
- * -- 
+/*
+ * _|      _|  _|      _|  _|_|_|
+ * _|      _|  _|_|  _|_|  _|    _|
+ * _|      _|  _|  _|  _|  _|    _|
+ *   _|  _|    _|      _|  _|    _|
+ *     _|      _|      _|  _|_|_|
+ * EspressoJS - Client Model
+ * --
  * Basic Clients Collection - API CRUD
- * ---
  * @param {*} app - Vimedev.com Labs
  */
 
 module.exports = (app) => {
   const clientRouter = require("../../server/controllers/client/client.controller.js");
-  const preFix = "/api/clients/",
-    url = preFix;
-
+  const url = "/api/clients/";
   /**
    * Create
    */
   app.post(url, clientRouter.create);
-
   /**
    * Get All
    */
   app.get(url, clientRouter.findAll);
-
   /**
    * Retrieve a single Note with clientId
    */
   app.get(url + ":clientId", clientRouter.findOne);
-
   /**
    * Update a Note with clientId
    */
   app.put(url + ":clientId", clientRouter.update);
-
   /**
    * Delete a Note with clientId
    */

package/routes/index.js

@@ -1,20 +1,22 @@
-/**
- * EspressoJS - Hippie's Fav Server Plate
- * Powered by Vimedev.com Labs
- * ----
- * Routes Control
+/*
+ * _|      _|  _|      _|  _|_|_|
+ * _|      _|  _|_|  _|_|  _|    _|
+ * _|      _|  _|  _|  _|  _|    _|
+ *   _|  _|    _|      _|  _|    _|
+ *     _|      _|      _|  _|_|_|
+ * EspressoJS - Routes Control
  * ----
  * @param {*} app - Vimedev.com Labs
  */
 
 module.exports = (app) => {
-  const configuration = require("../server"),
-    Path = require("path"),
-    api = require("./api");
+  const Path = require("path");
+  const configuration = require("../server");
+  const api = require("./api");
   app.get("/", function (res) {
     res.sendFile("index.html", { root: Path.join("./public") });
   });
-  if (configuration.swapi_isEnabled == true) {
+  if (configuration.api_isEnabled === true) {
     app.use("/api", api);
   }
   require("./db")(app);

package/server/config/development.js

@@ -0,0 +1,36 @@
+/*
+ * _|      _|  _|      _|  _|_|_|
+ * _|      _|  _|_|  _|_|  _|    _|
+ * _|      _|  _|  _|  _|  _|    _|
+ *   _|  _|    _|      _|  _|    _|
+ *     _|      _|      _|  _|_|_|
+ * EspressoJS - EspressoJS / Espresso
+ * Dev Template
+ */
+require("dotenv").config();
+const { readConfigFile } = require("../utils/config.utils");
+const data = readConfigFile();
+
+const config = {
+  env: data.instance || "development",
+  hostname: data.hostname || "dev.example.com",
+  port: data.port || "8080",
+  mongo_isEnabled:
+    data.mongoDB.enabled !== undefined ? data.mongoDB.enabled : true,
+  mongo: {
+    uri: data.mongoDB.uri || "localhost",
+    port: data.mongoDB.port || "27017",
+    db: data.mongoDB.instance || "myFirstDatabase",
+  },
+  api_isEnabled: data.api.enabled !== undefined ? data.api.enabled : true,
+  api: {
+    uri: data.api.uri || "https://swapi.dev/api/people/",
+    configs: {
+      method: data.api.method || "GET",
+      url: data.api.url || "",
+      headers: data.api.headers,
+    },
+  },
+};
+
+module.exports = config;

package/server/config/global.js

@@ -0,0 +1,35 @@
+/*
+ * _|      _|  _|      _|  _|_|_|
+ * _|      _|  _|_|  _|_|  _|    _|
+ * _|      _|  _|  _|  _|  _|    _|
+ *   _|  _|    _|      _|  _|    _|
+ *     _|      _|      _|  _|_|_|
+ * EspressoJS - EspressoJS / Espresso 
+ * Global Template w/ API
+ */
+require("dotenv").config();
+const { readConfigFile } = require("../utils/config.utils");
+const data = readConfigFile();
+
+const config = {
+  env: data.instance || "global",
+  hostname: data.hostname || "example.com",
+  port: data.port || "8080",
+  mongo_isEnabled:
+    data.mongoDB.enabled !== undefined ? data.mongoDB.enabled : false,
+  mongo: {
+    uri: data.mongoDB.uri || "localhost",
+    port: data.mongoDB.port || "27017",
+    db: data.mongoDB.instance || "myFirstDatabase",
+  },
+  api_isEnabled: data.api.enabled !== undefined ? data.api.enabled : false,
+  api: {
+    uri: data.api.uri || "https://swapi.dev/api/people/",
+    configs: {
+      method: data.api.method || "GET",
+      url: data.api.url || "",
+      headers: data.api.headers,
+    },
+  },
+};
+module.exports = config;

package/server/config/production.js

@@ -0,0 +1,35 @@
+/*
+ * _|      _|  _|      _|  _|_|_|
+ * _|      _|  _|_|  _|_|  _|    _|
+ * _|      _|  _|  _|  _|  _|    _|
+ *   _|  _|    _|      _|  _|    _|
+ *     _|      _|      _|  _|_|_|
+ * EspressoJS - EspressoJS / Espresso 
+ * Production Template
+ */
+require("dotenv").config();
+const { readConfigFile } = require("../utils/config.utils");
+const data = readConfigFile();
+
+const config = {
+  env: data.instance || "production",
+  hostname: data.hostname,
+  port: data.port || "80",
+  mongo_isEnabled:
+    data.mongoDB.enabled !== undefined ? data.mongoDB.enabled : false,
+  mongo: {
+    uri: data.mongoDB.uri || "localhost",
+    port: data.mongoDB.port || "27017",
+    db: data.mongoDB.instance || "myFirstDatabase",
+  },
+  api_isEnabled: data.api.enabled !== undefined ? data.api.enabled : false,
+  api: {
+    uri: data.api.uri || "https://swapi.dev/api/people/",
+    configs: {
+      method: data.api.method || "GET",
+      url: data.api.url || "",
+      headers: data.api.headers,
+    },
+  },
+};
+module.exports = config;

package/server/controllers/client/client.controller.js

@@ -1,18 +1,20 @@
-/**
- * EspressoJS - Hippie's Fav Server Plate
- * Powered by Vimedev.com Labs
- * ---
- * MongoDB Client Controller - WIP
+/*
+ * _|      _|  _|      _|  _|_|_|
+ * _|      _|  _|_|  _|_|  _|    _|
+ * _|      _|  _|  _|  _|  _|    _|
+ *   _|  _|    _|      _|  _|    _|
+ *     _|      _|      _|  _|_|_|
+ * EspressoJS - EspressoJS / Espresso is your one-stop
+ * Express Configuration starting point
  */
 
 const Client = require("../../models/client.model.js");
 
 /**
- * Retrieve and return all notes from the documents.
- * @param {*} req - Request data from
- * @param {*} res - Response from call
+ * Retrieve and return all clients from the collection.
+ * @param {*} req - Request data
+ * @param {*} res - Response data
  */
-
 exports.findAll = (req, res) => {
   Client.find()
     .then((clients) => {
@@ -20,38 +22,29 @@ exports.findAll = (req, res) => {
     })
     .catch((err) => {
       res.status(500).send({
-        message:
-          err.message || "Error occurred while retrieving your collections.",
+        message: err.message || "Error occurred while retrieving clients.",
       });
     });
 };
 
 /**
- * Create and Save a new Client('s) to Collection
- * @param {*} req
- * @param {*} res
+ * Create and save a new client to the collection.
+ * @param {*} req - Request data
+ * @param {*} res - Response data
  */
-
 exports.create = (req, res) => {
   if (!req.body.email) {
     return res.status(400).send({
-      message: "E-mail cannot be an empty field.",
+      message: "Email cannot be an empty field.",
     });
   }
 
-  /**
-   *  Client Body to be created after
-   *  Request byPass of cannot be null
-   */
   const client = new Client({
     name: req.body.name || "John Doe",
     email: req.body.email,
     location: req.body.location,
   });
 
-  /**
-   * Save Client in the document collection
-   */
   client
     .save()
     .then((data) => {
@@ -59,23 +52,22 @@ exports.create = (req, res) => {
     })
     .catch((err) => {
       res.status(500).send({
-        message: err.message || "Error occurred while creating the Note.",
+        message: err.message || "Error occurred while creating the client.",
       });
     });
 };
 
 /**
- * Find a single client with a clientId
- * @param {*} req
- * @param {*} res
+ * Find a single client by clientId.
+ * @param {*} req - Request data
+ * @param {*} res - Response data
  */
 exports.findOne = (req, res) => {
   Client.findById(req.params.clientId)
     .then((client) => {
       if (!client) {
         return res.status(404).send({
-          message:
-            "Client not found with the following id " + req.params.clientId,
+          message: "Client not found with id " + req.params.clientId,
         });
       }
       res.send(client);
@@ -93,10 +85,9 @@ exports.findOne = (req, res) => {
 };
 
 /**
- * Update a client('s) identified by the
- * clientId in the request collection
- * @param {*} req
- * @param {*} res
+ * Update a client identified by clientId.
+ * @param {*} req - Request data
+ * @param {*} res - Response data
  */
 exports.update = (req, res) => {
   if (!req.body.email) {
@@ -105,10 +96,6 @@ exports.update = (req, res) => {
     });
   }
 
-  /**
-   * Find client and update it with the request body
-   * depending on _id
-   */
   Client.findByIdAndUpdate(
     req.params.clientId,
     {
@@ -118,13 +105,13 @@ exports.update = (req, res) => {
     },
     { new: true }
   )
-    .then((clients) => {
-      if (!clients) {
+    .then((client) => {
+      if (!client) {
         return res.status(404).send({
           message: "Client not found with id " + req.params.clientId,
         });
       }
-      res.send(clients);
+      res.send(client);
     })
     .catch((err) => {
       if (err.kind === "ObjectId") {
@@ -139,14 +126,14 @@ exports.update = (req, res) => {
 };
 
 /**
- * Delete a client with the specified clientId in the request
- * @param {*} req
- * @param {*} res
+ * Delete a client by clientId.
+ * @param {*} req - Request data
+ * @param {*} res - Response data
  */
 exports.delete = (req, res) => {
   Client.findByIdAndRemove(req.params.clientId)
-    .then((Client) => {
-      if (!note) {
+    .then((client) => {
+      if (!client) {
         return res.status(404).send({
           message: "Client not found with id " + req.params.clientId,
         });
@@ -160,7 +147,7 @@ exports.delete = (req, res) => {
         });
       }
       return res.status(500).send({
-        message: "Could not delete Client with id " + req.params.clientId,
+        message: "Could not delete client with id " + req.params.clientId,
       });
     });
 };

package/server/index.js

@@ -1,17 +1,14 @@
 /*
- * EspressoJS - Hippie's Fav Server Plate
- * Powered by Vimedev.com Labs
- * ----------------
- * Configuration workflow
+ * _|      _|  _|      _|  _|_|_|
+ * _|      _|  _|_|  _|_|  _|    _|
+ * _|      _|  _|  _|  _|  _|    _|
+ *   _|  _|    _|      _|  _|    _|
+ *     _|      _|      _|  _|_|_|
+ * EspressoJS
  */
-const fs = require("fs");
-
 require("dotenv").config();
-const configBuffer = fs.readFileSync("./config.json"),
-  dataJSON = configBuffer.toString(),
-  data = JSON.parse(dataJSON);
-
-const env = data.instance || process.env.NODE_ENV || "development";
-const cfg = require("./config/config." + env);
-
+const { readConfigFile } = require("./utils/config.utils");
+const data = readConfigFile();
+const env = data.instance || "development";
+const cfg = require("./config/" + env);
 module.exports = cfg;

package/server/models/client.model.js

@@ -1,10 +1,11 @@
-/**
- * EspressoJS - Hippie's Fav Server Plate
- * Powered by Vimedev.com Labs
- * ----------------
+/*
+ * _|      _|  _|      _|  _|_|_|
+ * _|      _|  _|_|  _|_|  _|    _|
+ * _|      _|  _|  _|  _|  _|    _|
+ *   _|  _|    _|      _|  _|    _|
+ *     _|      _|      _|  _|_|_|
  * MongoDB Schema Example
  */
-
 const mongoose = require("mongoose");
 const clientSchema = mongoose.Schema(
   {

package/server/utils/config.utils.js

@@ -0,0 +1,23 @@
+const fs = require("fs");
+
+function readConfigFile() {
+  const cfgBuffer = fs.readFileSync("./config.json");
+  const cfgBuJSON = cfgBuffer.toString();
+  return JSON.parse(cfgBuJSON);
+}
+
+function writeConfigFile(cfg) {
+  const instUpdate = JSON.stringify(cfg);
+  fs.writeFileSync("config.json", instUpdate);
+}
+
+const vmdLogo = `
+( (
+  ) )
+........
+| .VMD |]
+|      /    
+'----'/.ZI|<..
+      `;
+
+module.exports = { readConfigFile, writeConfigFile, vmdLogo };

package/server/utils/espresso-cli.js

@@ -1,60 +1,76 @@
 /*
- * EspressoJS - Hippie's Favy Server Plate
- * Powered by Vimedev.com Labs
- * ----------------
- * Get Artsy! - CLI
+ * _|      _|  _|      _|  _|_|_|
+ * _|      _|  _|_|  _|_|  _|    _|
+ * _|      _|  _|  _|  _|  _|    _|
+ *   _|  _|    _|      _|  _|    _|
+ *     _|      _|      _|  _|_|_|
+ * EspressoJS - CLI
  */
 
-const fs = require("fs");
 const { exec } = require("child_process");
 const { string, number } = require("yargs");
 const yargs = require("yargs");
-const cfgBuffer = fs.readFileSync("./config.json");
-const cfgBuJSON = cfgBuffer.toString();
-const cfgB = JSON.parse(cfgBuJSON);
+const { readConfigFile, writeConfigFile, vmdLogo } = require("./config.utils");
+
+const cfgB = readConfigFile();
+function showCommand() {
+  console.log(cfgB);
+}
+function runCommand() {
+  if (cfgB !== undefined) {
+    const cmd_ct = vmdLogo;
+    console.warn(`${cmd_ct}`);
+    console.warn(
+      `Espresso CLI
+--------------
+Warming Up Configs..
+Running ....
+
+Instance Config:
+Configuration: ${cfgB.instance}
+Endpoint: localhost:${cfgB.port}
+JSON:`,
+      cfgB,
+      `\n\nTo stop process press CTRL+C`
+    );
+    exec(
+      `node ./node_modules/cross-env/src/bin/cross-env NODE_ENV=${cfgB.instance} PORT=${cfgB.port} node index.js`,
+      (error, stdout, stderr) => {
+        if (error) {
+          console.log(`error: ${error.message}`);
+          return;
+        }
+        if (stderr) {
+          console.log(`stderr: ${stderr}`);
+          return;
+        }
+        console.log(`stdout: ${stdout}`);
+      }
+    );
+  }
+}
+function envCommand(argv) {
+  if (argv.instance !== undefined) {
+    cfgB.instance = argv.instance;
+  }
+  if (cfgB.port !== argv.port) {
+    cfgB.port = argv.port;
+    console.warn("New config saved...");
+  } else {
+    console.warn("Config already saved...");
+  }
+  writeConfigFile(cfgB)
+}
 
 yargs.command({
   command: "show",
   describe: "Show pre-compiled Instance",
-  handler: function () {
-    console.log(cfgB);
-  },
+  handler: showCommand,
 });
 yargs.command({
   command: "run",
   describe: "Run pre-compiled Instance",
-  handler: function () {
-    if (cfgB !== undefined) {
-      const cmd_ct = `
-                  ( (
-                   ) )
-                ........
-                | .VMD |]
-                |      /    
-                 '----'/_zik...
-            `;
-      console.warn(`${cmd_ct}`);
-      console.warn(
-        `Espresso CLI\n--------------\nWarming Up Configs..\nRunning ....\n\nInstance Config:\nConfiguration: ${cfgB.instance}\nEndpoint: localhost:${cfgB.port}\nJSON:`,
-        cfgB,
-        `\n\nTo stop process press CTRL+C`
-      );
-      exec(
-        `node ./node_modules/cross-env/src/bin/cross-env NODE_ENV=${cfgB.instance} PORT=${cfgB.port} node espresso.js`,
-        (error, stdout, stderr) => {
-          if (error) {
-            console.log(`error: ${error.message}`);
-            return;
-          }
-          if (stderr) {
-            console.log(`stderr: ${stderr}`);
-            return;
-          }
-          console.log(`stdout: ${stdout}`);
-        }
-      );
-    }
-  },
+  handler: runCommand,
 });
 yargs.command({
   command: "env",
@@ -71,21 +87,6 @@ yargs.command({
       type: number,
     },
   },
-  handler: function (argv) {
-    if (argv.instance === undefined) {
-      cfgB.instance = cfgB.instance;
-    } else if (argv.instance !== cfgB.instance) {
-      cfgB.instance = argv.instance;
-    }
-    if (cfgB.port !== argv.port) {
-      cfgB.port = argv.port;
-      console.warn("New config saved...");
-    } else {
-      cfgB.port = cfgB.port;
-      console.warn("Config already saved...");
-    }
-    const instUpdate = JSON.stringify(cfgB);
-    fs.writeFileSync("config.json", instUpdate);
-  },
+  handler: envCommand,
 });
 yargs.parse();

package/server/utils/global.message.js

@@ -1,41 +1,19 @@
 /*
- * EspressoJS - Hippie's Favy Server Plate
- * Powered by Vimedev.com Labs
- * ----------------
- * Get Artsy! - Global Message for Non-CLI
+ * _|      _|  _|      _|  _|_|_|
+ * _|      _|  _|_|  _|_|  _|    _|
+ * _|      _|  _|  _|  _|  _|    _|
+ *   _|  _|    _|      _|  _|    _|
+ *     _|      _|      _|  _|_|_|
+ * EspressoJS - Init
  */
-
 module.exports = (app) => {
-  const fs = require("fs");
-  const cfg = require("./../");
-  const cfgBuffer = fs.readFileSync("./config.json");
-  const cfgBuJSON = cfgBuffer.toString();
-  const cfgB = JSON.parse(cfgBuJSON);
-
+  const { readConfigFile, vmdLogo } = require("config.utils");
+  const cfgB = readConfigFile();
   const cmd_header = "We are brewing your Espresso";
-  const cmd_nl = "\n";
-  const cmd_ct = `
-        ( (
-          ) )
-      ........
-      | .VMD |]
-      |      /    
-       '----'/_zik...
-  `;
+  const cmd_ct = vmdLogo;
   const cmd_ready = "Your Espresso is ready!";
   const cmd_port = `Instance Config\nLive Preview: http://localhost:${
     cfgB.port || process.env.PORT || cfg.port
   }`;
-  console.warn(
-    `${
-      cmd_header +
-      cmd_nl +
-      cmd_ct +
-      cmd_nl +
-      cmd_ready +
-      cmd_nl +
-      cmd_port +
-      cmd_nl
-    } \n\nTo stop process press CTRL+C`
-  );
+  console.warn(`${cmd_header}\n${cmd_ct}\n${cmd_ready}\n${cmd_port}\n\nTo stop the process, press CTRL+C`);
 };

package/server/config/config.development.js

@@ -1,35 +0,0 @@
-/*
- * EspressoJS - Hippie's Fav Server Plate
- * Powered by Vimedev.com Labs
- * ----------------
- *
- */
-
-var config = (module.exports = {});
-
-// Settings :: General's
-
-config.env = "development";
-config.hostname = "dev.example.com";
-config.port = "8080";
-
-// Settings :: MongoDB
-
-config.mongo_isEnabled = true;
-config.mongo = {};
-config.mongo.uri = process.env.MONGO_URI || "localhost";
-config.mongo.port = process.env.MONGO_URI_PORT || "27017";
-config.mongo.db = process.env.MONGO_URI_DB || "myFirstDatabase";
-
-// Settings :: SWAPI Sample
-
-config.swapi_isEnabled = true;
-config.swapi = {};
-config.swapi.uri = process.env.API_URI || "https://swapi.dev/api/people/";
-config.swapi.configs = {
-  method: "GET",
-  url: "",
-  headers: {
-    "Content-Type": "application/json",
-  },
-};

package/server/config/config.global.js

@@ -1,35 +0,0 @@
-/*
- * EspressoJS - Hippie's Fav Server Plate
- * Powered by Vimedev.com Labs
- * ----------------
- *
- */
-
-var config = (module.exports = {});
-
-// Settings :: General's
-
-config.env = "development";
-config.hostname = "global.example.com";
-config.port = "8080";
-
-// Settings :: MongoDB
-
-config.mongo_isEnabled = false;
-config.mongo = {};
-config.mongo.uri = process.env.MONGO_URI || "localhost";
-config.mongo.port = process.env.MONGO_URI_PORT ||"";
-config.mongo.db = process.env.MONGO_URI_DB ||"";
-
-// Settings :: SWAPI Sample
-
-config.swapi_isEnabled = true;
-config.swapi = {};
-config.swapi.uri = process.env.API_URI || "https://swapi.dev/api/";
-config.swapi.configs = {
-  method: "GET",
-  url: "",
-  headers: {
-    "Content-Type": "application/json",
-  },
-};

package/server/config/config.production.js

@@ -1,35 +0,0 @@
-/*
- * EspressoJS - Hippie's Fav Server Plate
- * Powered by Vimedev.com Labs
- * ----------------
- *
- */
-
-var config = (module.exports = {});
-
-// Settings :: General's
-
-config.env = "production";
-config.hostname = "www.example.com";
-config.port = "80";
-
-// Settings :: MongoDB
-
-config.mongo_isEnabled = false;
-config.mongo = {};
-config.mongo.uri = process.env.MONGO_URI || "localhost";
-config.mongo.port = process.env.MONGO_URI_PORT ||"27017";
-config.mongo.db = process.env.MONGO_URI_DB ||"clients";
-
-// Settings :: SWAPI Sample
-
-config.swapi_isEnabled = false;
-config.swapi = {};
-config.swapi.uri = process.env.API_URI || "https://swapi.dev/api/people/";
-config.swapi.configs = {
-  method: "GET",
-  url: "",
-  headers: {
-    "Content-Type": "application/json",
-  },
-};