@lmjs/cli 1.0.41 → 1.0.43

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);
@@ -379,16 +380,24 @@ 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 + "&" + new URLSearchParams(d ?? {});
+      else urled = urled + "?" + new URLSearchParams(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 +464,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/lib/files/project/src/images/lumen_icon_yellow.svg

@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 26.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 401.2 400" style="enable-background:new 0 0 401.2 400;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:url(#SVGID_1_);}
+	.st1{fill:url(#SVGID_00000121980058407996782030000001428573370188884122_);}
+	.st2{fill:url(#SVGID_00000152943445312239820940000001348209735848371111_);}
+	.st3{fill:url(#SVGID_00000182506215407219878010000004978831317569463227_);}
+</style>
+<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="428.0083" y1="569.0914" x2="305.5179" y2="631.5034" gradientTransform="matrix(1 0 0 1 0 -440)">
+	<stop  offset="0" style="stop-color:#F6A11A"/>
+	<stop  offset="0.2488" style="stop-color:#F6A31A"/>
+	<stop  offset="0.41" style="stop-color:#F7AA19"/>
+	<stop  offset="0.5463" style="stop-color:#F9B517"/>
+	<stop  offset="0.6688" style="stop-color:#FBC413"/>
+	<stop  offset="0.781" style="stop-color:#FED609"/>
+	<stop  offset="0.8073" style="stop-color:#FFDB06"/>
+	<stop  offset="1" style="stop-color:#F4E600"/>
+</linearGradient>
+<path class="st0" d="M312.1,188.4c-1,15.8,4,26.6,12.7,37.5c12.1,15.2,46.2,34.6,65.6,43.4v-166c0.1-12.5-2.1-21.7-4.2-27.8
+	c-3.3-9.8-7.2-15.1-8.3-25.5c-0.8-7.2,0.2-13.3,1.1-17.1c-18.6,38.5-37.3,77.1-56,115.6C316.9,161.2,313,174.7,312.1,188.4z"/>
+<linearGradient id="SVGID_00000006699273835235655250000012902414653514590898_" gradientUnits="userSpaceOnUse" x1="28.6056" y1="708.1651" x2="222.6818" y2="677.278" gradientTransform="matrix(1 0 0 1 0 -440)">
+	<stop  offset="0" style="stop-color:#F6A11A"/>
+	<stop  offset="0.1626" style="stop-color:#F7A61A"/>
+	<stop  offset="0.3697" style="stop-color:#F8B21A"/>
+	<stop  offset="0.601" style="stop-color:#FAC41A"/>
+	<stop  offset="0.848" style="stop-color:#FCDB1A"/>
+	<stop  offset="1" style="stop-color:#FEEB17"/>
+	<stop  offset="1" style="stop-color:#F6A11A"/>
+</linearGradient>
+<path style="fill:url(#SVGID_00000006699273835235655250000012902414653514590898_);" d="M222.6,256.9c-1.1-45.5-47.6-62-57.9-69.9
+	S33.4,127.6,33.4,127.6l-7.3-3.1v118.2c0,66.8,54.4,126.9,120.9,132c5.3,0.4,10.2,0.4,15.6,0.1c3.4-0.2,4.4,1.4,2.6,4.4
+	c-2.6,4.3-4.4,11.1-5.1,12c2.3-3.1,13.3-19.6,15.6-22.8C175.8,368.4,223.7,302.4,222.6,256.9z"/>
+<linearGradient id="SVGID_00000023973866845629556700000008098464440569412238_" gradientUnits="userSpaceOnUse" x1="218.3323" y1="168.8993" x2="174.0283" y2="10.906">
+	<stop  offset="0" style="stop-color:#FEEB17"/>
+	<stop  offset="0.1117" style="stop-color:#FCDA1A"/>
+	<stop  offset="0.2557" style="stop-color:#FAC71A"/>
+	<stop  offset="0.4088" style="stop-color:#F9B71B"/>
+	<stop  offset="0.5733" style="stop-color:#F7AB1A"/>
+	<stop  offset="0.7572" style="stop-color:#F6A41A"/>
+	<stop  offset="1" style="stop-color:#F6A11A"/>
+</linearGradient>
+<path style="fill:url(#SVGID_00000023973866845629556700000008098464440569412238_);" d="M287.2,151.4c12.8-15.9,18.4-22.5,37.5-56
+	c9.1-15.9,23.7-41.5,42.7-74c-2.3,3.9-6.3,9-12,9.9c-9.9,1.5-35.9-22.4-91.1-22.4H26v91.3c0,1.9-1.6,3.4-3.6,3.3
+	c-6.7-0.7-14-4.1-14-4.1S231.1,221.2,287.2,151.4z"/>
+<linearGradient id="SVGID_00000031196562025411060430000008544292392537440944_" gradientUnits="userSpaceOnUse" x1="279.2118" y1="708.8517" x2="301.8741" y2="815.4693" gradientTransform="matrix(1 0 0 1 0 -440)">
+	<stop  offset="0" style="stop-color:#F4E600"/>
+	<stop  offset="5.336942e-02" style="stop-color:#F5DF00"/>
+	<stop  offset="0.2273" style="stop-color:#F7CA02"/>
+	<stop  offset="0.3891" style="stop-color:#F8B910"/>
+	<stop  offset="0.5328" style="stop-color:#F8AE15"/>
+	<stop  offset="0.6434" style="stop-color:#F8AA16"/>
+	<stop  offset="1" style="stop-color:#F6A11A"/>
+</linearGradient>
+<path style="fill:url(#SVGID_00000031196562025411060430000008544292392537440944_);" d="M238.5,297.8c-9.8,9.8-33.3,53.4-44.9,75.5
+	h108.9c48.6,0,88-39.4,88-88l0,0C284.4,238.6,251.6,284.7,238.5,297.8z"/>
+</svg>

package/lib/files/project/src/views/home.view

@@ -1,13 +1,36 @@
-<div>
-    Home View
+<div class="hv100">
+    <div class="ph50">
+        <div class="pv10 r" style="height: 50px;">
+            <grid_nm gap10>
+                <div class="vm">
+                    <a href="https://www.npmjs.com/package/@lmjs/cli">
+                        <div class="mdi mdi-npm fs40 cw"></div>
+                    </a>
+                </div>
+                <div class="vm">
+                    <a href="https://github.com/bea-technology/lmjs-cli">
+                        <div class="mdi mdi-github fs34 cw"></div>
+                    </a>
+                </div>
+            </grid_nm>
+        </div>
+    </div>
+    <div class="cc sq cov" style="background-image: url('/images/lumen_icon_yellow.svg'); height: 250px;"></div>
 </div>
-<script>
-</script>
+
+
+
+<style>
+    body {
+        color: rgba(255, 255, 255, .87);
+        background-color: #242424;
+    }
+</style>
 
 <settings>
     {
-    hasFooter: true,
-    hasHeader: true,
-    hasNav: true
+    hasFooter: false,
+    hasHeader: false,
+    hasNav: false
     }
 </settings>

package/lib/files/project/src/views/widgets/nav.view

@@ -1,13 +0,0 @@
-<style>
-    a.active {
-        font-weight: 900;
-        color: black;
-    }
-</style>
-<div class="oh pv40 upper cb70">
-    <grid_nm gap40>
-        <div><a href="/" n0="home">Home</a></div>
-        <div><a href="/about" n0="about">About Us</a></div>
-        <div><a href="/contact" n0="contact">Contact Us</a></div>
-    </grid_nm>
-</div>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lmjs/cli",
-  "version": "1.0.41",
+  "version": "1.0.43",
   "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"

package/lib/files/project/src/views/about.view

@@ -1,14 +0,0 @@
-<div>
-    About View
-</div>
-<script>
-    
-</script>
-
-<settings>
-    {
-    hasFooter: true,
-    hasHeader: true,
-    hasNav: true
-    }
-</settings>

package/lib/files/project/src/views/contact.view

@@ -1,14 +0,0 @@
-<div>
-    Contact View
-</div>
-<script>
-    
-</script>
-
-<settings>
-    {
-    hasFooter: true,
-    hasHeader: true,
-    hasNav: true
-    }
-</settings>