@lmjs/cli 1.0.13 → 1.0.14

package/lib/app.js

@@ -1,26 +1,46 @@
 var fs = require('fs');
 const axios = require('axios').default;
 const path = require("path");
-var uws = require('uWebSockets.js');
+
+const express = require('express');
+var compression = require('compression');
+const app = express();
+const server = require('http').createServer(app);
+var WebSocketServer = require("ws").Server;
+var wss = new WebSocketServer({ server: server, path: "/" });
 const fcs = require("./fcs.js");
-const mime = require('mime-types');
 var cl = console.log;
-var zlib = require('zlib');
+
+var cookieParser = require('cookie-parser');
+var expressSession = require('express-session');
+const bodyParser = require('body-parser');
+var multer = require('multer');
+var upload = multer();
+
+let session = expressSession({
+  secret: 'keyboardcat',
+  resave: true,
+  saveUninitialized: true,
+  cookie: { maxAge: 9999000 }
+});
+
 var config = fcs.getConfig();
 var _views = {};
 var _comps = {};
-function toArrayBuffer(buffer) {
-  return buffer.buffer.slice(buffer.byteOffset, buffer.byteOffset + buffer.byteLength);
-}
-uws.App().ws('/*', {
-  idleTimeout: 8,
-  maxBackpressure: 1024 * 1024,
-  maxPayloadLength: 16 * 1024 * 1024,
-  compression: uws.SHARED_COMPRESSOR,
-  open: (ws) => {
-    ws.subscribe('/home/rat');
-  },
-  message: async (ws, message, isBinary) => {
+
+app.use(compression());
+app.use(cookieParser());
+app.use(session);
+app.use('/', express.static(`${process.cwd()}` + path.sep + `src`));
+app.set('etag', false);
+app.use(bodyParser.urlencoded({ extended: true }));
+app.use(bodyParser.json());
+app.use(bodyParser.raw());
+app.use(upload.array());
+
+wss.on('connection', (ws) => {
+  ws.on('message', async (message) => {
+
     try {
       const buffer = Buffer.from(message);
       const data = JSON.parse(buffer.toString());
@@ -53,95 +73,55 @@ uws.App().ws('/*', {
               headers: _body['headers'] ?? config.apis[_body['api'] ?? 0].headers
             });
             _data.payload = res.data;
-            if (ws.isSubscribed('/home/rat')) ws.send(JSON.stringify(_data), false, true);
+            ws.send(JSON.stringify(_data));
 
           } catch (e) {
             _data.payload = { "code": 108, "error": e.message, "type": "RequestError" };
-            if (ws.isSubscribed('/home/rat')) ws.send(JSON.stringify(_data), false, true);
+            ws.send(JSON.stringify(_data));
           }
           return;
         }
 
-        if (ws.isSubscribed('/home/rat')) ws.send(JSON.stringify(_data), false, true);
+        ws.send(JSON.stringify(_data));
 
       }
     } catch (e) {
 
     }
-  },
-  drain: (ws) => {
-  },
-  close: (ws, code, message) => {
-  }
-
-}).get('/*', async (res, req) => {
-  let nodes = req.getUrl().split("/");
-  while (nodes[0] == "") nodes.shift();
-  let _nodes = JSON.parse(JSON.stringify(nodes));
-  let pubDir = `${process.cwd()}` + path.sep + `src`;
-  let filePath = "";
-  let errorPath = path.sep + '404.html';
-  if (nodes[0]) {
-    let last = nodes[nodes.length - 1];
-    while (_nodes.length) filePath += path.sep + _nodes.shift();
-    if (last.indexOf('.') > -1) {
-      filePath = fs.existsSync(pubDir + path.sep + filePath) ? filePath : errorPath;
-    } else {
-      if (!fs.existsSync(pubDir + path.sep + `views` + path.sep + nodes[0] + '.view')) {
-        filePath = errorPath;
-      } else {
-        filePath = path.sep + 'index.html';
-      }
-    }
-  } else filePath = path.sep + 'index.html';
-
-  let readStream;
-  let paths = req.getUrl();
-  const acceptEncoding = req.getHeader('accept-encoding');
-
-  // at this point you need a way to get the requested file and catch errors if the file does not exist:
-  const fileName = pubDir + filePath; // i have some DANGEROUS_PATH_PATTERN test on the path var you must make sure it's safe
-  try {
-    readStream = toArrayBuffer(fs.readFileSync(fileName)); // toArrayBuffer is a function i got from examples
-  } catch (err) {
-    readStream = 'Error reading file.. or something';
-  }
-
-  readStream = toArrayBuffer(fs.readFileSync(fileName));
-  // setting headers and responding: res.aborted must be present
-  res.onAborted(() => {
-    res.aborted = true;
-  });
-  // write the headers and respond
-
-  res.cork(() => {
-    const mimeT = mime.lookup(pubDir + filePath) || 'application/octet-stream';
-    res.writeHeader('Content-Type', mimeT);
-    // for (let i = 0; i < securityHeaders.length; i++) res.writeHeader(securityHeaders[i].name, securityHeaders[i].value);
-    if (!acceptEncoding) acceptEncoding = '';
-    if (/\bgzip\b/.test(acceptEncoding)) {
-      res.writeHeader('Content-Encoding', 'gzip');
-      readStream = zlib.gzipSync(readStream);
-    } else if (/\bdeflate\b/.test(acceptEncoding)) {
-      res.writeHeader('Content-Encoding', 'deflate');
-      readStream = zlib.deflateSync(readStream);
-    }
-    if (!res.aborted) res.end(readStream);
   });
 
+  ws.send('Hi there, I am a WebSocket server');
+});
+
+global.app = app;
+global.axios = axios;
+global.wss = wss;
+global.fs = fs;
+global.path = path;
+
+var API = fcs.API;
+global.API = API;
+
+if (fs.existsSync(`${process.cwd()}` + path.sep + `src` + path.sep + `app.js`)) {
+  require(`${process.cwd()}` + path.sep + `src` + path.sep + `app.js`);
+}
+
+app.get('*', function (req, res) {
+  let nodes = req.params[0].split("/");
+  if (nodes.length) nodes.shift();
+  res.sendFile(`${process.cwd()}` + path.sep + `src` + path.sep + ((fs.existsSync(`${process.cwd()}` + path.sep + `src` + path.sep + `views` + path.sep + nodes[0] + `.view`)) ? 'index' : '404') + `.html`);
+  return;
+});
+
+app.post('*', function (req, res) {
+  let nodes = req.params[0].split("/");
+  if (nodes.length) nodes.shift();
+  res.sendFile(`${process.cwd()}` + path.sep + `src` + path.sep + ((fs.existsSync(`${process.cwd()}` + path.sep + `src` + path.sep + `views` + path.sep + nodes[0] + `.view`)) ? 'index' : '404') + `.html`);
   return;
-}).any('/*', (res, req) => {
-  res.end('Nothing to see here!');
-}).listen(config.server.port * 1, (listenSocket) => {
-  if (listenSocket) {
-    // for automatic port selection use 0 as port above and we'll get one below this line.
-    // port = uws.us_socket_local_port(listenSocket);
-    // console.log('Listening to port ' + port);
-    console.log(`LumenJS server running at http://${config.server.host}:${config.server.port}/`);
-    _views = fcs.getAllFiles(`${process.cwd()}` + path.sep + `src` + path.sep + `views` + path.sep);
-    _comps = fcs.getAllFiles(`${process.cwd()}` + path.sep + `src` + path.sep + `comps` + path.sep);
-  } else {
-    console.log('Failed to run LumenJS server');
-  }
+});
 
+server.listen(config.server.port, function () {
+  console.log(`LumenJS server running at http://${config.server.host}:${config.server.port}/`);
+  _views = fcs.getAllFiles(`${process.cwd()}` + path.sep + `src` + path.sep + `views` + path.sep);
+  _comps = fcs.getAllFiles(`${process.cwd()}` + path.sep + `src` + path.sep + `comps` + path.sep);
 });

package/package.json

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