vaderjs 1.4.1-ui7iuy47 → 1.4.2

package/vader.js

@@ -3,7 +3,7 @@ import { exec } from "child_process";
 import fs from "fs";
 globalThis.currentCommand = null;
 globalThis.isRunning = false;
-let vaderisInstalled = process.cwd() + "/node_modules/vaderjs/binaries/main.js";
+let vaderisInstalled = process.cwd() + "/node_modules/vaderjs/binaries/vader.js";
 if (!fs.existsSync(process.cwd() + "/_dev")) {
   fs.mkdirSync(process.cwd() + "/_dev");
   !fs.existsSync(process.cwd() + "/_dev/readme.md") && fs.writeFileSync(process.cwd() + "/_dev/readme.md", `This folder is used by vader.js to store important files, deletables include: Bun, Chrome - These should only be uninstalled if you need to reinstall them.`);
@@ -36,6 +36,15 @@ function checkIFBundleIsInstalled() {
 }
 
 function run() {
+  if(!fs.existsSync(porcess.cwd() + "/pages")) {
+    fs.mkdirSync(process.cwd() + "/pages");
+  }
+  if(!fs.existsSync(porcess.cwd() + "/public")) {
+    fs.mkdirSync(process.cwd() + "/public");
+  } 
+  if(!fs.existsSync(process.cwd() + "/src")) {
+    fs.mkdirSync(process.cwd() + "/src");
+  }
   if (!fs.existsSync(process.cwd() + "/package.json")) {
     fs.writeFileSync(process.cwd() + "/package.json", JSON.stringify({ name: "my_app", version: "1.0.0" }, null, 2));
     return;
@@ -86,59 +95,7 @@ function run() {
                 
    `);
 }
-
-function checkIFChromeIumIsInstalled() {
-  let platform = process.platform;
-  let findChrome = {
-    windows: `powershell -c "${process.cwd() + "\\node_modules\\vaderjs\\binaries\\win32\\check.ps1"}"`,
-    others: "/usr/bin/chromium-browser --version",
-  };
-  let installCommands = {
-    windows: `winget install Google.Chrome`,
-    others: "sudo apt-get install chromium-browser -y",
-  };
-  findChrome.windows = findChrome.windows.replace(/\n/g, " ");
-  let commandToRun = platform === "win32" ? findChrome.windows : findChrome.others;
-
-  return new Promise((resolve, reject) => {
-    if (fs.existsSync(process.cwd() + "/_dev/chrome")) {
-      resolve(true);
-    } else {
-      exec(commandToRun, (err, stdout, stderr) => {
-        let hasError = false;
-        if (err) {
-          console.log(err);
-          hasError = true;
-          console.log(`Attempting to install DEPENDENCY: ${platform === "win32" ? "Google Chrome" : "Chromium"}`);
-        }
-        if (stdout && !hasError) {
-          resolve(`${platform === "win32" ? "Google Chrome" : "Chromium"} is installed: ${stdout}`);
-          fs.writeFileSync(process.cwd() + "/_dev/chrome", `Installed: ${stdout}`);
-        }
-        if (stderr) {
-          console.log(stderr);
-          console.log(`Installing DEPENDENCY: ${platform === "win32" ? "Google Chrome" : "Chromium"}`);
-          let installCommand = platform === "win32" ? installCommands.windows : installCommands.others;
-          return new Promise((resolve, reject) => {
-            exec(installCommand, (err, stdout, stderr) => {
-              if (err) {
-                reject(err);
-              }
-              if (stdout) {
-                resolve(`${platform === "win32" ? "Google Chrome" : "Chromium"} installed successfully: ${stdout}`);
-                fs.writeFileSync(process.cwd() + "/_dev/chrome", `Installed: ${stdout}`);
-                run();
-              }
-              if (stderr) {
-                reject(`${platform === "win32" ? "Google Chrome" : "Chromium"} failed to install: ${stderr}`);
-              }
-            });
-          });
-        }
-      });
-    }
-  });
-}
+ 
 let Commands = {
   dev: `bun run dev`,
   build: `bun run build`,
@@ -159,72 +116,62 @@ switch (true) {
     currentCommand = null;
     break;
 }
-checkIFChromeIumIsInstalled()
-  .then((stdout) => {
+checkIFBundleIsInstalled()
+.then((stdout) => {
+  if (stdout && !isRunning) {
+    if (!fs.existsSync(process.cwd() + "/_dev/bun")) {
+      fs.writeFileSync(process.cwd() + "/_dev/bun", `Installed: ${stdout}`);
+    }
+    run();
+    globalThis.isRunning = true;
+  }
+})
+.catch(async (err) => {
+  console.log("Bun.js is not installed. Installing....");
+  let installScipt = {
+    windows: 'powershell -c "irm bun.sh/install.ps1|iex',
+    others: "curl -fsSL https://bun.sh/install.sh | bash",
+  };
+  let scriptotRun = process.platform === "win32" ? installScipt.windows : installScipt.others;
+  exec(scriptotRun, async (err, stdout, stderr) => {
+    if (err) {
+      console.log("Error installing bun.js, may want to install manually");
+      process.exit(1);
+    }
     if (stdout) {
-      checkIFBundleIsInstalled()
-        .then((stdout) => {
-          if (stdout && !isRunning) {
-            if (!fs.existsSync(process.cwd() + "/_dev/bun")) {
-              fs.writeFileSync(process.cwd() + "/_dev/bun", `Installed: ${stdout}`);
-            }
-            run();
-            globalThis.isRunning = true;
-          }
-        })
-        .catch(async (err) => {
-          console.log("Bun.js is not installed. Installing....");
-          let installScipt = {
-            windows: 'powershell -c "irm bun.sh/install.ps1|iex',
-            others: "curl -fsSL https://bun.sh/install.sh | bash",
-          };
-          let scriptotRun = process.platform === "win32" ? installScipt.windows : installScipt.others;
-          exec(scriptotRun, async (err, stdout, stderr) => {
+      if (!process.platform === "win32") {
+        await new Promise((resolve, reject) => {
+          console.log(`Adding bun.js to path...`); 
+          exec("source ~/.bashrc", (err, stdout, stderr) => {
             if (err) {
               console.log("Error installing bun.js");
-              process.exit(1);
+              return;
             }
             if (stdout) {
-              if (!process.platform === "win32") {
-                await new Promise((resolve, reject) => {
-                  console.log(`Adding bun.js to path...`);
-                  let shell = null;
-                  exec("source ~/.bashrc", (err, stdout, stderr) => {
-                    if (err) {
-                      console.log("Error installing bun.js");
-                      return;
-                    }
-                    if (stdout) {
-                      run();
-                    }
-                    if (stderr) {
-                      console.log("Error installing bun.js");
-                      process.exit(1);
-                    }
-                  });
-                });
-                exec("chmod +x bun.sh/install.sh", (err, stdout, stderr) => {
-                  if (err) {
-                    console.log("Error installing bun.js");
-                    return;
-                  }
-                  if (stdout) {
-                    console.log("Bun.js installed successfully");
-                    run();
-                  }
-                  if (stderr) {
-                    console.log("Error installing bun.js");
-                    process.exit(1);
-                  }
-                });
-              }
               run();
             }
+            if (stderr) {
+              console.log("Error installing bun.js");
+              process.exit(1);
+            }
           });
         });
+        exec("chmod +x bun.sh/install.sh", (err, stdout, stderr) => {
+          if (err) {
+            console.log("Error installing bun.js");
+            return;
+          }
+          if (stdout) {
+            console.log("Bun.js installed successfully");
+            run();
+          }
+          if (stderr) {
+            console.log("Error installing bun.js");
+            process.exit(1);
+          }
+        });
+      }
+      run();
     }
-  })
-  .catch(async (err) => {
-    console.error(err);
-    process.exit(1);
   });
+});

package/@integrations/ssg.js

@@ -1,189 +0,0 @@
-import fs from 'fs';
-import playwright from 'playwright';
-globalThis.routeDocuments = {}
-let context = process.env.isVader === 'true' ? true : false
-/**
- * 
- * @param {Object} config 
- * @param {string} config.pages - The directory where the pages are located
- * @param {string} config.output - The directory where the pages are to be outputted
- */
-
-
-import http from 'http';
-let hasGenerated = []
-let server = http.createServer((req, res) => {
-  if (!req.url.includes(".")) {
-    let params = new URLSearchParams(req.url.split("?")[1]);
-    let folder = params.get("folder");
-
-    let content = globalThis.routeDocuments[folder]
-    res.writeHead(200, { "Content-Type": "text/html" });
-
-    res.end(content);
-  } else {
-    if (req.url.includes('./')) {
-      req.url = req.url.replace('./', '/')
-    }
-    const filePath = process.cwd() + "/dist/" + req.url;
-
-    fs.readFile(filePath, (err, data) => {
-      if (err) {
-        res.writeHead(404, {
-          "Content-Type": filePath.includes("js")
-            ? "text/javascript"
-            : "text/html",
-        });
-        res.end("File not found");
-      } else {
-        res.writeHead(200, {
-          "Content-Type": filePath.includes("js")
-            ? "text/javascript"
-            : "text/html",
-        });
-        res.end(data);
-      }
-    });
-  }
-});
-
-const generateHTML = (routeData) => {
-   
-  let { path, file, isParam, params, query, pathname } = routeData;
-  let baseFolder =  file.split('/').filter(f => f !== 'dist').join('/')
-  if (file.includes('./dist')) {
-    baseFolder = file.split('./dist')[1]
-  }
-
-  let isCatchAll = false;
-
-  let html = `
-<!DOCTYPE html>
-  <html>
-   <head> 
-   
-<title>Vaderjs v1.3.3</title>
-<meta name="description" content="Vader.js is a modern web framework for building web applications.">
-<link rel="shortcut icon" href="https://raw.githubusercontent.com/Postr-Inc/Vader.js/main/logo.png" type="image/x-icon">
-   </head>
-   <body>
-   <script id="v">
-   window.$SERVER = true
-   </script>
-   <div id="app"></div>
-   <script id="router" type="module">
-    import Router from '/router.js' 
-    
-    const rt = new Router
-    ${Array.isArray(params)
-      ? params
-        .map((param) => {
-          if (!param.jsFile) return "";
-          let ranName = Math.random()
-            .toString(36)
-            .substring(7)
-            .replace(".", "");
-          let pd = Object.keys(param.paramData)[0];
-          let baseFolder = path
-            .split("/")
-            .filter((f) => f !== "pages")
-            .join("/");
-             
-         if(pd === '$catchall'){
-            isCatchAll = true;
-            console.log('catchall')
-            return `
-            import c${ranName} from '${param.jsFile}'
-            rt.get($SERVER ? '/' : '/${baseFolder}/*', c${ranName})
-            `
-         }
-
-          return ` 
-          
-      import c${ranName} from '${param.jsFile}'
-      rt.get('/${baseFolder}/:${pd}', c${ranName})
-      `;
-        })
-        .join("")
-      : ""
-    }
-    let c = await import('${baseFolder}')  
-    if(Object.keys(c).includes('$prerender') && c.$prerender === false){
-      document.head.setAttribute('prerender', 'false')
-    }
-    ${
-      !isCatchAll ? `rt.get($SERVER? '/' : '${pathname}', c)` : ``
-    }
-     
-    rt.listen()
-   </script>
-   </body>
-  </html>`
-  return html;
-
-}
-/**
- * @integration Server Side Generator
- * @description Generate a static webapp from your Vader.js application
- * @returns 
- */
-const ssg = async (config) => {
-  return new Promise(async (resolve, reject) => {
-    let { pages, output } = config;
-    let routes = JSON.parse(fs.readFileSync(`${process.cwd()}/_dev/meta/routes.json`).toString())
-    for (var i in routes) {
-      let route = routes[i];
-       
-      if(route.path.includes('[')){
-         continue
-      }
-      let html = generateHTML(route);
-      globalThis.routeDocuments[routes[i].path] = html;
-      let browser = await playwright.chromium.launch({
-        headless: true,
-        executablePath: process.platform === 'win32' ? '' : '/usr/bin/chromium-browser'
-      });
-      globalThis.browser = browser;
-      let page = await browser.newPage();
-      await page.goto(`http://localhost:8700?folder=${routes[i].path}`);
-      await page.evaluate(() => {
-        document.querySelector('script#v').innerHTML = `window.$SERVER = false`
-        if(document.head.getAttribute('prerender') === 'false'){
-          document.querySelector("#app").innerHTML = "";
-        }
-      });
-      let content = await page.content();
-      console.log(`Writing ${routes[i].path} to ${output}/${routes[i].path}/index.html`)
-      if (output.includes('./dist')) {
-        output = output.split('./dist')[1]
-      }
-      let path = '/dist/' + output  + routes[i].path + '/index.html';
-      fs.writeFileSync(process.cwd() + path, content)
-      hasGenerated.push(routes[i].path)
-    }
-
-    if (hasGenerated.length === routes.length) {
-      console.log(`Static site generation complete`)
-      browser.close()
-      server.close()
-      resolve() 
-      process.exit()
-    }
-  })
-} 
- 
-if(context){ 
-  server.listen(8700);
-  await ssg({ pages: './pages', output: './dist' })
-}
- 
-
-export default {
-  name: 'Vaderjs Static Site Generator',
-  version: '1.0.0',
-  useRuntime: 'node',
-  entryPoint: process.cwd() + '/node_modules/vaderjs/@integrations/ssg.js',
-  on: ['build', 'dev:change'],
-}
-
-

package/LICENSE

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2024 Pascal
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.

package/binaries/IPC/index.js

@@ -1,277 +0,0 @@
-import { WebSocketServer } from "ws";
-import WebSocket from "ws";
-/**
- * @class IPC
- * @description Inter-Process Communication - allows you to communicate with vaderjs using Bun.js
- */
-class IPC {
-  constructor(config = { port: 3434 }) {
-    this.server = {
-      port: config.port,
-      /**
-       * @property {IPC} instance - The instance of the IPC server
-       */
-      instance: null,
-      clients: [],
-      /**
-       *
-       * @private
-       */
-      sendMsg: (msg) => {
-        this.server.clients.forEach((client) => {
-          client.send(JSON.stringify({ IPC_TYPE: this.type, msg }));
-        });
-      },
-    };
-    /**
-     * @enum {Object} typeEnums - The type of process to spawn
-     */
-    this.typeEnums = {
-      /**
-       * @enum {Number} WATCHER - The file watching process
-       */
-      WATCHER: 1,
-      /**
-       * @enum {Number} PAGEGENERATOR - The page generator process
-       */
-      PAGEGENERATOR: 2,
-      /**
-       * @enum {Number} DFT - The default process
-       */
-      DFT: 3,
-    };
-
-    this.listeners = [];
-    this.type = this.typeEnums.DFT;
-  }
-  /**
-   * @property {Boolean} NOLISTEN - Whether to listen for incoming messages or not
-   */
-  NOLISTEN = false;
-  /**
-   * @Object Console
-   * @description The console object to use for logging - Bun.spawn has 0 way of reading logs from the spawned process so this is a workaround
-   */
-  Console = {
-    log: (msg, IPC_TYPE) => {
-      this.server.clients.forEach((client) => {
-        client.send(JSON.stringify({ IPC_TYPE: PROTOCOL, CONSOLE: true, LOG: true, msg }));
-      });
-    },
-    error: (msg, errorLevel, IPC_TYPE) => {
-      this.server.clients.forEach((client) => {
-        client.send(JSON.stringify({ IPC_TYPE: PROTOCOL, CONSOLE: true, ERROR: true, errorLevel, msg }));
-      });
-    },
-    warn: (msg, IPC_TYPE) => {
-      this.server.clients.forEach((client) => {
-        client.send(JSON.stringify({ IPC_TYPE: PROTOCOL, CONSOLE: true, WARN: true, msg }));
-      });
-    },
-    info: (msg, IPC_TYPE) => {
-      this.server.clients.forEach((client) => {
-        client.send(JSON.stringify({ IPC_TYPE: PROTOCOL, CONSOLE: true, INFO: true, msg }));
-      });
-    },
-    debug: (msg, IPC_TYPE) => {
-      this.server.clients.forEach((client) => {
-        client.send(JSON.stringify({ IPC_TYPE: PROTOCOl, CONSOLE: true, DEBUG: true, msg }));
-      });
-    },
-  };
-
-  spawnServer(type = this.typeEnums.DFT) {
-    this.isntSpawned = false;
-    if (!this.server.instance) {
-      // if used in achildProcess reconnect to the main running server
-      this.server.instance = new WebSocketServer({ port: this.server.port });
-    } else {
-      // switch type
-      this.server.instance.clients.forEach((client) => {
-        client.send(JSON.stringify({ PROTO_CHANGE: true, IPC_TYPE: type }));
-      });
-    }
-
-    this.server.instance.on("connection", (ws) => {
-      this.server.clients.push(ws);
-
-      this.server.instance.clients.forEach((client) => {
-        client.send(JSON.stringify({ ESTABLISHED: true, IPC_TYPE: type }));
-      });
-      ws.on("message", (msg) => {
-        msg = JSON.parse(msg);
-        if (msg.CLIENTINIT) {
-          let port = msg.port;
-          ws.send(JSON.stringify({ ESTABLISHED: true, IPC_TYPE: type }));
-          return;
-        } else if (msg.SERVERINIT) {
-          ws.send(JSON.stringify({ ESTABLISHED: true, IPC_TYPE: type }));
-          return;
-        }
-
-        this.server.clients.forEach((client) => {
-          client.send(JSON.stringify(msg));
-        });
-      });
-    });
-
-    this.server.instance.on("close", () => {
-      this.server.clients = [];
-    });
-
-    // spawn if nolisten is false
-    this.isntSpawned = true;
-  }
-
-  /**
-   * @method newServer
-   * @description Creates a new IPC server instance
-   * @param {IPC.typeEnums} proto
-   * @param {Object} config
-   * @returns
-   */
-  async newServer(proto = 0, config = { port: 3434 }) {
-    const client = new WebSocket(`ws://localhost:${config.port}`);
-
-    client.on("open", () => {
-      client.send(JSON.stringify({ SERVERINIT: true, IPC_TYPE: proto }));
-    });
-    client.on("message", (msg) => {
-      if (msg.ESTABLISHED && msg.IPC_TYPE === proto) {
-        config?.onMessage(msg);
-      }
-    });
-    let port = config.port;
-
-    const sendMsg = (msg) => {
-      if (!client.readyState) {
-        let i = setInterval(() => {
-          if (client.readyState) {
-            client.send(JSON.stringify({ IPC_TYPE: proto, msg, port, isServer: true }));
-            clearInterval(i);
-          }
-        }, 1000);
-        return;
-      }
-      client.send(JSON.stringify({ IPC_TYPE: proto, msg, port, isServer: true }));
-    };
-
-    sendMsg({ ESTABLISHED: true, IPC_TYPE: proto, port });
-    return {
-      sendMsg: (msg) => {
-        sendMsg(msg);
-      },
-      /**
-       * @method Console
-       * @description The console object to use for logging - Bun.spawn has 0 way of reading logs from the spawned process so this is a workaround
-       */
-      Console: {
-        log: (msg) => {
-          sendMsg({ CONSOLE: true, data: msg });
-        },
-        error: (msg, errorLevel) => {
-          sendMsg({ CONSOLE: true, ERROR: true, errorLevel, msg });
-        },
-        warn: (msg) => {
-          sendMsg({ CONSOLE: true, WARN: true, msg });
-        },
-        info: (msg) => {
-          sendMsg({ CONSOLE: true, INFO: true, msg });
-        },
-      },
-      listen: (callback) => {
-        client.on("message", (msg) => {
-          callback(msg);
-        });
-      },
-      onError: (callback) => {
-        client.on("error", (err) => {
-          callback(err);
-        });
-      },
-    };
-  }
-
-  listen(callback) {
-    this.server.instance.on("message", (msg) => {
-      callback(msg);
-    });
-  }
-
-  client(config = { use: this.typeEnums.DFT, port: 0, callback: () => {} }) {
-    if (!this.server.instance) {
-      this.spawnServer();
-    }
-    const ws = new WebSocket(`ws://localhost:${config.port}`);
-    ws.on("open", () => {
-      console.log(config);
-    });
-    ws.send(JSON.stringify({ CLIENTINIT: true, IPC_TYPE: config.use, port: config.port }));
-
-    function listen(callback) {
-      ws.on("message", (msg) => {
-        callback(msg);
-      });
-    }
-    return {
-      Console: {
-        read: (callback) => {
-          listen((msg) => {
-            msg = JSON.parse(msg.toString());
-            if (msg.isServer && msg.IPC_TYPE === config.use && msg.port === config.port && msg?.msg?.CONSOLE) {
-              callback(msg);
-            }
-          });
-        },
-        write: (msg) => {
-          ws.send(JSON.stringify({ CONSOLE_LOG: true, msg }));
-        },
-      },
-      sendMsg: (msg) => {
-        ws.send(JSON.stringify({ IPC_TYPE: config.use, msg }));
-      },
-      listen: (callback) => {
-        ws.on("message", (msg) => {
-          callback(msg);
-        });
-      },
-      close: () => {
-        ws.close();
-      },
-      onError: (callback) => {
-        ws.on("error", (err) => {
-          callback(err);
-        });
-      },
-    };
-  }
-
-  sendMsg(batch, callback) {
-    switch (true) {
-      case Array.isArray(batch):
-        console.log(`Using incremental sending`);
-        let timeBetween = 1000;
-        batch.forEach((msg, i) => {
-          setTimeout(() => {
-            this.server.sendMsg(msg);
-          }, i * timeBetween);
-        });
-        break;
-      case typeof batch === "string":
-        this.server.sendMsg(batch);
-        break;
-      default:
-        this.server.sendMsg(batch.toString());
-        break;
-    }
-  }
-}
-
-/**
- * @module IPCServer
- * @description The IPC server instance
- 
- */
-let IPCServer = new IPC({ port: 3434 });
-
-export default IPCServer;