@lmjs/cli 1.0.42 → 1.0.44

package/lib/app.js

@@ -1,7 +1,5 @@
 var fs = require('fs');
-const axios = require('axios').default;
 const path = require("path");
-
 const express = require('express');
 var compression = require('compression');
 const app = express();
@@ -65,18 +63,17 @@ wss.on('connection', (ws) => {
             let pata = data.payload;
             let __data = pata['data'];
             let _body = pata['body'];
-            let res = await axios({
-              method: _body['method'].toString().toLowerCase(),
-              url: fcs.validURL(_body['path']) ? _body['path'] : (config.apis[_body['api'] ?? 0].baseURL + _body['path']),
-              data: __data ?? {},
-              headers: _body['headers'] ?? config.apis[_body['api'] ?? 0].headers
-            });
+            var resa = await API.req(_body['path'], __data, _body['headers'], _body['method'], _body['api'], true);
+            let res = await resa.text();
+            try {
+              res = JSON.parse(res);
+            } catch (e) {
+            }
             _data.payload = (_body['full']) ? {
-              "headers": res.headers,
-              "data": res.data
-            } : res.data;
+              "headers": resa.headers,
+              "data": res
+            } : res;
             ws.send(JSON.stringify(_data));
-
           } catch (e) {
             _data.payload = { "code": 108, "error": e.message, "type": "RequestError" };
             ws.send(JSON.stringify(_data));
@@ -91,10 +88,11 @@ wss.on('connection', (ws) => {
 
     }
   });
-});
+}).on('error', (e) => { });
 
 global.app = app;
-global.axios = axios;
+var fetch = fcs.fetch;
+global.fetch = fetch;
 global.wss = wss;
 global.fs = fs;
 global.path = path;
@@ -120,8 +118,14 @@ app.post('*', function (req, res) {
   return;
 });
 
-server.listen(config.server.port, function () {
-  console.log(`LumenJS server running at http://${config.server.host}:${config.server.port}/`);
+server.listen(config.server.port > 0 ? config.server.port : 0, function (err) {
+  cl(`LumenJS server running at http://${config.server.host}:${config.server.port > 0 && server.address().port == config.server.port ? config.server.port : server.address().port}/`);
   _views = fcs.getAllFiles(`${process.cwd()}` + path.sep + `src` + path.sep + `views` + path.sep);
   _tpls = fcs.getAllFiles(`${process.cwd()}` + path.sep + `src` + path.sep + `tpls` + path.sep);
+}).on('error', (e) => {
+  if (e.code === 'EADDRINUSE') {
+    cl('Port ' + config.server.port + ' is already in use..');
+    server.close();
+    server.listen(0);
+  }
 });

package/lib/check-version.js

@@ -1,6 +1,5 @@
 #!/usr/bin/env node
 const semver = require('semver');
-const axios = require('axios').default;
 const path = require('path');
 const fs = require("fs");
 const fcs = require("./fcs.js");
@@ -13,9 +12,9 @@ if (!semver.satisfies(m[0].toString(), '>=12')) {
     console.log("Node version should be minimum 12.0.0");
     process.exit(1);
 } else {
-    axios.get(BEA_Libs.BEAJS, {})
+    fcs.API.get(BEA_Libs.BEAJS, {})
         .then((beajs) => {
-            axios.get(BEA_Libs.BEACSS, {})
+            fcs.API.get(BEA_Libs.BEACSS, {})
                 .then((beacss) => {
                     var libsPath = `${__dirname}` + path.sep + `files` + path.sep + `libs`;
                     fcs.cd(libsPath);

package/lib/fcs.js

@@ -1,4 +1,4 @@
-const axios = require("axios").default;
+const fetch = require('node-fetch');
 const path = require("path");
 const fs = require("fs");
 const nodemon = require("nodemon");
@@ -16,6 +16,7 @@ const BEA_Libs = {
 exports.getAllFiles = getAllFiles;
 exports.ucwords = ucwords;
 
+exports.fetch = fetch;
 exports.getConfig = getConfig;
 function getConfig() {
   config = {
@@ -100,10 +101,10 @@ function create(conf) {
         if (!fs.existsSync(libsPath + path.sep + "bea.js")) getLibs = true;
       }
       if (getLibs) {
-        axios
+        API
           .get(BEA_Libs.BEAJS, {})
           .then((beajs) => {
-            axios.get(BEA_Libs.BEACSS, {}).then((beacss) => {
+            API.get(BEA_Libs.BEACSS, {}).then((beacss) => {
               var libsPath =
                 `${__dirname}` + path.sep + `files` + path.sep + `libs`;
               cd(libsPath);
@@ -363,6 +364,22 @@ function validURL(string) {
 
 exports.validURL = validURL;
 
+
+let getPairs = (obj, keys = []) =>
+  Object.entries(obj).reduce((pairs, [key, value]) => {
+    if (typeof value === 'object')
+      pairs.push(...getPairs(value, [...keys, key]));
+    else
+      pairs.push([[...keys, key], value]);
+    return pairs;
+  }, []);
+
+function pairIt(obj) {
+  return getPairs(obj).map(([[key0, ...keysRest], value]) =>
+    `${key0}${keysRest.map(a => `[${a}]`).join('')}=${value}`)
+    .join('&');
+}
+
 var API = {
   get: async function (u, d, h, a) {
     return await this.req(u, d, h, "GET", a);
@@ -379,16 +396,26 @@ var API = {
   patch: async function (u, d, h, a) {
     return await this.req(u, d, h, "PATCH", a);
   },
-  req: async function (u, d, h, m, a) {
-    let res = await axios({
+  req: async function (u, d, h, m, a, f) {
+
+    var urled = validURL(u) ? u : config.apis[a ?? 0].baseURL + u;
+    if (m.toString().toLowerCase() == 'get') {
+      if (urled.indexOf('?') > -1) urled = urled + "&" + pairIt(d ?? {});
+      else urled = urled + "?" + pairIt(d ?? {});
+    }
+    let resa = await fetch(urled, {
       method: m.toString().toLowerCase(),
-      url: validURL(u) ? u : config.apis[a ?? 0].baseURL + u,
-      data: d ?? {},
+      body: m.toString().toLowerCase() == 'get' ? null : JSON.stringify(d ?? {}),
       headers: h ?? config.apis[a ?? 0].headers,
-      maxContentLength: 100000000,
-      maxBodyLength: 1000000000,
     });
-    return res.data;
+
+    if (f) return resa;
+    let res = await resa.text();
+    try {
+      return JSON.parse(res);
+    } catch (e) {
+      return res;
+    }
   },
 };
 exports.API = API;
@@ -455,6 +482,8 @@ function processCommands(cmd) {
   } else if (command == "build") {
     let cmds = process.argv;
     _bp(cmds);
+  } else if (command == "-v" || command == "-version") {
+    console.log("LumenJS version " + require('../package.json').version);
   } else {
     console.log("LumenJS CLI's command not found!");
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lmjs/cli",
-  "version": "1.0.42",
+  "version": "1.0.44",
   "description": "Command line interface for super fast LumenJS development. LumenJS is a tiny robust reactive javascript framework for building scalable and high-performant web applications and web user interfaces, be it simple or complex, with standard HTML, CSS and JavaScript",
   "bin": {
     "lm": "./bin/commands.js",
@@ -35,7 +35,7 @@
     "lumen bea"
   ],
   "dependencies": {
-    "@lmjs/core": "^1.0.6"
+    "@lmjs/core": "^1.0.7"
   },
   "engines": {
     "node": ">=12.0.0"