@lmjs/cli 1.0.21 → 1.0.22

package/index.js

@@ -155,54 +155,6 @@ async function buildProject(cmds) {
       fs.writeFileSync(dest + path.sep + "js" + path.sep + "bea.js", String(zode.code));
       fs.writeFileSync(dest + path.sep + "css" + path.sep + "bea.css", String(beaCSSCode));
       fs.writeFileSync(dest + path.sep + "index.html", String(indexCode).split('<script src="/index.js" type="text/javascript"></script>').join("").split('/js/bea.js').join("/js/bea.js?v" + new Date().getTime()).split('/css/styles.css').join("/css/styles.css?v" + new Date().getTime()).split('/css/bea.css').join("/css/bea.css?v" + new Date().getTime()));
-
-
-      if (cmds.indexOf('--deploy') >= 0) {
-        spinner.succeed('Writing Files').start('Uploading To Server..');
-        const _config = {
-          user: config.ftp.username,
-          // Password optional, prompted if none given
-          password: config.ftp.password,
-          host: config.ftp.host,
-          port: config.ftp.port,
-          localRoot: dest,
-          remoteRoot: config.ftp.remotePath,
-          include: ["*", "**/*", ".*"],      // this would upload everything except dot files
-          // include: ["*.js", "dist/*", ".*"],
-          // e.g. exclude sourcemaps, and ALL files in node_modules (including dot files)
-          exclude: config.ftp.ignore,
-          // delete ALL existing files at destination before uploading, if true
-          deleteRemote: false,
-          // Passive mode is forced (EPSV command is not sent)
-          forcePasv: true,
-          // use sftp or ftp
-          sftp: false,
-        };
-        // console.log(_config);
-
-        ftpDeploy.deploy(_config, function (err, res) {
-          if (err) {
-            console.log(err);
-          } else {
-            spinner.succeed("Finished Uploading To Server");
-            spinner.succeed("Done");
-          }
-        });
-        ftpDeploy.on("uploading", function (data) {
-          spinner.start(parseFloat(((data.transferredFileCount) * 100 / data.totalFilesCount).toFixed(2)) + '% ' + 'Uploading ' + data.filename + ' ');
-        });
-        // ftpDeploy.on("uploaded", function (data) {
-        //   console.log(data); // same data as uploading event
-        // });
-        // ftpDeploy.on("log", function (data) {
-        //   console.log(data); // same data as uploading event
-        // });
-        // ftpDeploy.on("upload-error", function (data) {
-        //   console.log(data.err); // data will also include filename, relativePath, and other goodies
-        // });
-
-      } else
-        spinner.succeed('Writing Files').succeed("Done");
     } else {
       fcs.copyDir(`${__dirname}` + path.sep + `lib` + path.sep + `files` + path.sep + buildPath, dest);
       fcs.copyDir(projectPath + path.sep + "src", dest + path.sep + "src", "_beajsBuild");
@@ -210,6 +162,14 @@ async function buildProject(cmds) {
       fcs.cd(dest + path.sep + "src" + path.sep + "css");
       fcs.cd(dest + path.sep + "src" + path.sep + "images");
 
+      let appFile = projectPath + path.sep + `src` + path.sep + "app.js";
+      if (fs.existsSync(appFile)) {
+        var appCode = fs.readFileSync(appFile, "utf8");
+        var serverJsCode = fs.readFileSync(`${__dirname}` + path.sep + `lib` + path.sep + `files` + path.sep + buildPath + path.sep + "server.js", "utf8");
+        fs.writeFileSync(dest + path.sep + "server.js", String(serverJsCode).split('//APP_HOLDER').join(appCode));
+        fs.unlinkSync(dest + path.sep + "src" + path.sep + "app.js");
+      }
+
       // fcs.copyDir(projectPath + path.sep + `src` + path.sep + `css`, dest + path.sep + "src" + path.sep + "css");
       fcs.copyDir(projectPath + path.sep + "src" + path.sep + "js", dest + path.sep + "src" + path.sep + "js", "_beajsBuild");
       fcs.copyDir(projectPath + path.sep + "src" + path.sep + "css", dest + path.sep + "src" + path.sep + "css", "_beajsBuild");
@@ -220,9 +180,55 @@ async function buildProject(cmds) {
       fs.writeFileSync(dest + path.sep + "src" + path.sep + "index.html", String(indexCode).split('<script src="/index.js" type="text/javascript"></script>').join(""));
       fs.writeFileSync(dest + path.sep + "config.js", String(zode2.code));
 
-      spinner.succeed('Writing Files').succeed("Done");
     }
 
+    if (cmds.indexOf('--deploy') >= 0) {
+      spinner.succeed('Writing Files').start('Uploading To Server..');
+      const _config = {
+        user: config.ftp.username,
+        // Password optional, prompted if none given
+        password: config.ftp.password,
+        host: config.ftp.host,
+        port: config.ftp.port,
+        localRoot: dest,
+        remoteRoot: config.ftp.remotePath,
+        include: ["*", "**/*", ".*"],      // this would upload everything except dot files
+        // include: ["*.js", "dist/*", ".*"],
+        // e.g. exclude sourcemaps, and ALL files in node_modules (including dot files)
+        exclude: config.ftp.ignore,
+        // delete ALL existing files at destination before uploading, if true
+        deleteRemote: false,
+        // Passive mode is forced (EPSV command is not sent)
+        forcePasv: true,
+        // use sftp or ftp
+        sftp: false,
+      };
+      // console.log(_config);
+
+      ftpDeploy.deploy(_config, function (err, res) {
+        if (err) {
+          console.log(err);
+        } else {
+          spinner.succeed("Finished Uploading To Server");
+          spinner.succeed("Done");
+        }
+      });
+      ftpDeploy.on("uploading", function (data) {
+        spinner.start(parseFloat(((data.transferredFileCount) * 100 / data.totalFilesCount).toFixed(2)) + '% ' + 'Uploading ' + data.filename + ' ');
+      });
+      // ftpDeploy.on("uploaded", function (data) {
+      //   console.log(data); // same data as uploading event
+      // });
+      // ftpDeploy.on("log", function (data) {
+      //   console.log(data); // same data as uploading event
+      // });
+      // ftpDeploy.on("upload-error", function (data) {
+      //   console.log(data.err); // data will also include filename, relativePath, and other goodies
+      // });
+
+    } else
+      spinner.succeed('Writing Files').succeed("Done");
+
   });
 
 }

package/lib/files/build/func.js

@@ -1,66 +1,102 @@
-const axios = require('axios').default;
-const path = require("path")
-const express = require('express');
-var compression = require('compression');
+const axios = require("axios").default;
+const path = require("path");
+const express = require("express");
+var compression = require("compression");
 const app = express();
-const server = require('http').createServer(app);
-const io = require('socket.io')(server);
-var cookieParser = require('cookie-parser');
-var expressSession = require('express-session');
-const bodyParser = require('body-parser');
-var multer = require('multer');
-const config = require('./config').config;
+const server = require("http").createServer(app);
+
+var WebSocketServer = require("ws").Server;
+var wss = new WebSocketServer({ server: server, path: "/" });
+
+var cookieParser = require("cookie-parser");
+var expressSession = require("express-session");
+const bodyParser = require("body-parser");
+var multer = require("multer");
+const config = require("./config").config;
 var upload = multer();
 let session = expressSession({
-    secret: 'beajs',
-    resave: true,
-    saveUninitialized: true,
-    cookie: { maxAge: 9999000 }
+  secret: "lumenjs",
+  resave: true,
+  saveUninitialized: true,
+  cookie: { maxAge: 9999000 },
 });
 
-function validURL(str) {
-    var pattern = new RegExp('^(https?:\\/\\/)?' +
-        '((([a-z\\d]([a-z\\d-]*[a-z\\d])*)\\.)+[a-z]{2,}|' +
-        '((\\d{1,3}\\.){3}\\d{1,3}))' +
-        '(\\:\\d+)?(\\/[-a-z\\d%_.~+]*)*' +
-        '(\\?[;&a-z\\d%_.~+=-]*)?' +
-        '(\\#[-a-z\\d_]*)?$', 'i');
-    return !!pattern.test(str);
+function validURL(string) {
+let url;
+try {
+    url = new URL(string);
+} catch (_) {
+    return false;
 }
+return url.protocol === "http:" || url.protocol === "https:";
+}
+
+exports.validURL = validURL;
 
 exports.config = config;
 exports.server = function () {
-    return server;
+  return server;
 };
 exports.app = function () {
-    app.use(cookieParser());
-    app.use(session);
-    app.use(compression());
-    app.use(express.static(path.join(__dirname, './src')));
-    app.set('etag', false);
-    app.use(bodyParser.urlencoded({ extended: true }));
-    app.use(bodyParser.json());
-    app.use(bodyParser.raw());
-    app.use(upload.array());
+  app.use(cookieParser());
+  app.use(session);
+  app.use(compression());
+  app.use(express.static(path.join(__dirname, "./src")));
+  app.set("etag", false);
+  app.use(bodyParser.urlencoded({ extended: true }));
+  app.use(bodyParser.json());
+  app.use(bodyParser.raw());
+  app.use(upload.array());
 
-    io.use(function (socket, next) {
-        session(socket.request, socket.request.res, next);
-    });
+  wss.on("connection", (ws) => {
+    ws.on("message", async (message) => {
+      try {
+        const buffer = Buffer.from(message);
+        const data = JSON.parse(buffer.toString());
+
+        if (data.hasOwnProperty("e")) {
+          var _data = {
+            e: data.e,
+            _iter: data._iter,
+            payload: {},
+          };
 
-    io.on('connection', function (socket) {
-        socket.on("request", async function (_data, _body, cb) {
+          if (data.e == "request") {
             try {
-                let res = await axios({
-                    method: _data['method'].toString().toLowerCase(),
-                    url: validURL(_data['path']) ? _data['path'] : (config.apis[_data['api'] ?? 0].baseURL + _data['path']),
-                    data: _body ?? {},
-                    headers: _data['headers'] ?? config.apis[_data['api'] ?? 0].headers
-                });
-                cb(res.data);
+              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,
+              });
+              _data.payload = _body["full"]
+                ? {
+                    headers: res.headers,
+                    data: res.data,
+                  }
+                : res.data;
+              ws.send(JSON.stringify(_data));
             } catch (e) {
-                cb({ "code": 108, "error": e.message, "type": "RequestError" });
+              _data.payload = {
+                code: 108,
+                error: e.message,
+                type: "RequestError",
+              };
+              ws.send(JSON.stringify(_data));
             }
-        });
+            return;
+          }
+
+          ws.send(JSON.stringify(_data));
+        }
+      } catch (e) {}
     });
-    return app;
-}
+  });
+  return app;
+};

package/lib/files/build/package.json

@@ -23,7 +23,7 @@
         "express-session": "^1.17.3",
         "compression": "^1.7.4",
         "multer": "^1.4.5-lts.1",
-        "socket.io": "^4.5.1"
+        "ws": "^8.8.1"
     },
     "engines": {
         "node": ">=12.0.0"

package/lib/files/build/server.js

@@ -1,9 +1,40 @@
 const path = require('path');
+const axios = require("axios").default;
 const func = require('./func');
 const app = func.app();
 const server = func.server();
 var config = func.config;
 
+var API =
+{
+    get: async function (u, d, h, a) {
+        return await this.req(u, d, h, "GET", a);
+    },
+    put: async function (u, d, h, a) {
+        return await this.req(u, d, h, "PUT", a);
+    },
+    post: async function (u, d, h, a) {
+        return await this.req(u, d, h, "POST", a);
+    },
+    delete: async function (u, d, h, a) {
+        return await this.req(u, d, h, "DELETE", a);
+    },
+    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({
+            method: m.toString().toLowerCase(),
+            url: func.validURL(u) ? u : (config.apis[a ?? 0].baseURL + u),
+            data: d ?? {},
+            headers: h ?? config.apis[a ?? 0].headers
+        });
+        return res.data;
+    }
+};
+
+//APP_HOLDER
+
 app.get('/', (req, res) => {
   res.sendFile(path.join(__dirname, './src/index.html'));
 });
@@ -23,5 +54,5 @@ app.post('*', function (req, res) {
 });
 
 server.listen(config.server.port, function () {
-  console.log(`BEAJS client server running at http://${config.server.host}:${config.server.port}/`);
+  console.log(`LumenJS client server running at http://${config.server.host}:${config.server.port}/`);
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lmjs/cli",
-  "version": "1.0.21",
+  "version": "1.0.22",
   "description": "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",
   "main": "./index.js",
   "bin": {