Merge pull request #5 from lllllllillllllillll/main

Merge updated readme and changelog

CHANGELOG.md

@@ -1,4 +1,9 @@
-## 0.01 (Oct 15th 2023)
+## 0.02 (Nov 1st 2023)
+* Significant code clean-up and improvements
+* CPU and RAM graphs for each container
+* Updated Templates.json
+* Fixed text color of VPN and VNC buttons
+
 
-First release. 
-Not much working. Basically a graphic demo.
+## 0.01 (Oct 15th 2023)
+* First release. Not much working.

README.md

@@ -3,7 +3,7 @@
 
 DweebUI is a simple docker web interface created with Javascript and Node.js
 
-Pre-Pre-Pre-Pre-Pre Alpha v 0.01 ( :fire: Experimental. Don't install on any servers you care about :fire: )
+Pre-Pre-Pre-Pre-Pre Alpha v 0.02 ( :fire: Experimental. Don't install on any servers you care about :fire: )
 
 * I haven't used Github very much, and I'm still new to Javascript
 * This is the first project I've ever released, and I'm sure it's full of plenty of bugs and mistakes.

controllers/app_actions.js

@@ -1,183 +0,0 @@
-const { writeFileSync, mkdirSync, readFileSync } = require("fs");
-const { exec, execSync } = require("child_process");
-const { dashCard } = require('../components/dashCard');
-const yaml = require('js-yaml');
-
-
-
-exports.Install = async function (req, res) {
-    
-    if (req.session.role == "admin") {
-
-
-        let { service_name, name, image, command_check, command, net_mode, restart_policy } = req.body;
-
-        let { port0, port1, port2, port3, port4, port5 } = req.body;
-        let { volume0, volume1, volume2, volume3, volume4, volume5 } = req.body;
-        let { env0, env1, env2, env3, env4, env5, env6, env7, env8, env9, env10, env11 } = req.body;
-        let { label0, label1, label2, label3, label4, label5, label6, label7, label8, label9, label10, label11 } = req.body;
-
-
-        if (image.startsWith('https://')){
-            mkdirSync(`./appdata/${name}`, { recursive: true });
-            execSync(`curl -o ./appdata/${name}/${name}_stack.yml -L ${image}`);
-            console.log(`Downloaded stackfile: ${image}`);
-            let stackfile = yaml.load(readFileSync(`./appdata/${name}/${name}_stack.yml`, 'utf8'));
-            let services = Object.keys(stackfile.services);
-
-            for ( let i = 0; i < services.length; i++ ) {
-                try {
-                    console.log(stackfile.services[Object.keys(stackfile.services)[i]].environment);
-                } catch { console.log('no env') }
-            }
-            
-        } else {
-
-            let container_info = {
-                name: name,
-                service: service_name,
-                state: 'installing',
-                image: image,
-                restart_policy: restart_policy
-            }
-            
-
-            let installCard = dashCard(container_info);
-
-            req.app.locals.install = installCard;
-
-            let compose_file = `version: '3'`;
-            compose_file += `\nservices:`
-            compose_file += `\n  ${service_name}:`
-            compose_file += `\n    container_name: ${name}`;
-            compose_file += `\n    image: ${image}`;
-
-            // Command
-            if (command_check == 'on') {
-                compose_file += `\n    command: ${command}`
-            }
-
-            // Network mode
-            if (net_mode == 'host') {
-                compose_file += `\n    network_mode: 'host'`
-            }
-            else if (net_mode != 'host' && net_mode != 'docker') {
-                compose_file += `\n    network_mode: '${net_mode}'`
-            }
-            
-            // Restart policy
-            if (restart_policy != '') {
-                compose_file += `\n    restart: ${restart_policy}`
-            }
-
-            // Ports
-            if ((port0 == 'on' || port1 == 'on' || port2 == 'on' || port3 == 'on' || port4 == 'on' || port5 == 'on') && (net_mode != 'host')) {
-                compose_file += `\n    ports:`
-
-                    for (let i = 0; i < 6; i++) {
-                        if (req.body[`port${i}`] == 'on') {
-                            compose_file += `\n      - ${req.body[`port_${i}_external`]}:${req.body[`port_${i}_internal`]}/${req.body[`port_${i}_protocol`]}`
-                        }
-                    }
-            }
-
-            // Volumes
-            if (volume0 == 'on' || volume1 == 'on' || volume2 == 'on' || volume3 == 'on' || volume4 == 'on' || volume5 == 'on') {
-                compose_file += `\n    volumes:`
-
-                for (let i = 0; i < 6; i++) {
-                    if (req.body[`volume${i}`] == 'on') {
-                        compose_file += `\n      - ${req.body[`volume_${i}_bind`]}:${req.body[`volume_${i}_container`]}:${req.body[`volume_${i}_readwrite`]}`
-                    }
-                }
-            }
-
-            // Environment variables
-            if (env0 == 'on' || env1 == 'on' || env2 == 'on' || env3 == 'on' || env4 == 'on' || env5 == 'on' || env6 == 'on' || env7 == 'on' || env8 == 'on' || env9 == 'on' || env10 == 'on' || env11 == 'on') {
-                compose_file += `\n    environment:`
-            }
-            for (let i = 0; i < 12; i++) {
-                if (req.body[`env${i}`] == 'on') {
-                    compose_file += `\n      - ${req.body[`env_${i}_name`]}=${req.body[`env_${i}_default`]}`
-
-                }
-            }
-
-            // Add labels
-            if (label0 == 'on' || label1 == 'on' || label2 == 'on' || label3 == 'on' || label4 == 'on' || label5 == 'on' || label6 == 'on' || label7 == 'on' || label8 == 'on' || label9 == 'on' || label10 == 'on' || label11 == 'on') {
-                compose_file += `\n    labels:`
-            }   
-            for (let i = 0; i < 12; i++) {
-                if (req.body[`label${i}`] == 'on') {
-                    compose_file += `\n      - ${req.body[`label_${i}_name`]}=${req.body[`label_${i}_value`]}`
-                }
-            }
-
-            // Add privileged mode 
-
-            if (req.body.privileged == 'on') {
-                compose_file += `\n    privileged: true`
-            }
-
-
-            // Add hardware acceleration to the docker-compose file if one of the environment variables has the label DRINODE
-            if (env0 == 'on' || env1 == 'on' || env2 == 'on' || env3 == 'on' || env4 == 'on' || env5 == 'on' || env6 == 'on' || env7 == 'on' || env8 == 'on' || env9 == 'on' || env10 == 'on' || env11 == 'on') {
-                for (let i = 0; i < 12; i++) {
-                    if (req.body[`env${i}`] == 'on') {
-                        if (req.body[`env_${i}_name`] == 'DRINODE') {
-                            compose_file += `\n    deploy:`
-                            compose_file += `\n      resources:`
-                            compose_file += `\n        reservations:`
-                            compose_file += `\n          devices:`
-                            compose_file += `\n          - driver: nvidia`
-                            compose_file += `\n            count: 1`
-                            compose_file += `\n            capabilities: [gpu]`
-                        }
-                    }
-                }
-            }
-
-            try {   
-                mkdirSync(`./appdata/${name}`, { recursive: true });
-                writeFileSync(`./appdata/${name}/docker-compose.yml`, compose_file, function (err) { console.log(err) });
-
-                exec(`docker compose -f ./appdata/${name}/docker-compose.yml up -d`, (error, stdout, stderr) => {
-                    if (error) { console.error(`error: ${error.message}`); return; }
-                    if (stderr) { console.error(`stderr: ${stderr}`); return; }
-                    console.log(`stdout:\n${stdout}`);
-                });
-            } catch { console.log('error creating directory or compose file') }
-
-        }
-
-        // Redirect to the home page
-        res.redirect("/");
-    } else {
-        // Redirect to the login page
-        res.redirect("/login");
-    }
-}
-
-
-
-exports.Uninstall = async function (req, res) {
-    
-    if (req.session.role == "admin") {
-
-
-        if (req.body.confirm == 'Yes') {
-            exec(`docker compose -f ./appdata/${req.body.service_name}/docker-compose.yml down`, (error, stdout, stderr) => {
-                if (error) { console.error(`error: ${error.message}`); return; }
-                if (stderr) { console.error(`stderr: ${stderr}`); return; }
-                console.log(`stdout:\n${stdout}`);
-            });
-        }
-
-
-        // Redirect to the home page
-        res.redirect("/");
-    } else {
-        // Redirect to the login page
-        res.redirect("/login");
-    }
-}

functions/systeminformation.js

@@ -1,150 +0,0 @@
-const { currentLoad, mem, networkStats, fsSize, dockerContainerStats } = require('systeminformation');
-var Docker = require('dockerode');
-var docker = new Docker({ socketPath: '/var/run/docker.sock' });
-const { dashCard } = require('../components/dashCard');
-
-
-
-module.exports.serverStats = async function () {
-    const cpuUsage = await currentLoad();
-    const ramUsage = await mem();
-    const netUsage = await networkStats();
-    const diskUsage = await fsSize();
-
-    const info = {
-        cpu: Math.round(cpuUsage.currentLoad),
-        ram: Math.round((ramUsage.active / ramUsage.total) * 100),
-        tx: netUsage[0].tx_bytes,
-        rx: netUsage[0].rx_bytes,
-        disk: diskUsage[0].use,
-    };
-
-    return info;
-}
-
-
-
-module.exports.containerList = async function () {
-    let card_list = '';
-
-    const data = await docker.listContainers({ all: true });
-    for (const container of data) {
-        let imageVersion = container.Image.split('/');
-        let service = imageVersion[imageVersion.length - 1].split(':')[0];
-
-        let containerId = docker.getContainer(container.Id);
-        let containerInfo = await containerId.inspect();
-
-        let open_ports = [];
-        let external_port = 0;
-        let internal_port = 0;
-
-        for (const [key, value] of Object.entries(containerInfo.HostConfig.PortBindings)) {
-            open_ports.push(`${value[0].HostPort}`);
-            external_port = value[0].HostPort;
-            internal_port = key;
-
-            if ((external_port == undefined) || (internal_port == undefined)) {
-                external_port = 0;
-                internal_port = 0;
-            }
-        }
-
-        let volumes = [];
-        for (const [key, value] of Object.entries(containerInfo.Mounts)) {
-            volumes.push(`${value.Source}: ${value.Destination}: ${value.RW}`);
-        }
-
-        let environment_variables = [];
-        for (const [key, value] of Object.entries(containerInfo.Config.Env)) {
-            environment_variables.push(`${key}: ${value}`);
-        }
-
-        let labels = [];
-        for (const [key, value] of Object.entries(containerInfo.Config.Labels)) {
-            labels.push(`${key}: ${value}`);
-        }
-
-
-        let container_info = {
-            name: container.Names[0].slice(1),
-            service: service,
-            id: container.Id,
-            state: container.State,
-            image: container.Image,
-            external_port: external_port,
-            internal_port: internal_port
-        }
-
-        let dockerCard = dashCard(container_info);
-
-        card_list += dockerCard;
-        
-    }
-
-    return card_list;
-}
-
-
-
-
-
-
-
-module.exports.containerStats = async function () {
-
-    let container_stats = [];
-
-    const data = await docker.listContainers({ all: true });
-
-    for (const container of data) {
-
-        const stats = await dockerContainerStats(container.Id);
-        let container_stat = {
-            name: container.Names[0].slice(1),
-            cpu: Math.round(stats[0].cpuPercent),
-            ram: Math.round(stats[0].memPercent)
-        }
-
-        //push stats to an array
-        container_stats.push(container_stat);
-    }
-    return container_stats;
-}
-
-
-
-
-
-
-module.exports.containerAction = async function (data) {
-
-    let { user, role, action, container, state } = data;
-
-    console.log(`${user} wants to: ${action} ${container}`);
-    
-    if (role == 'admin') {
-        var containerName = docker.getContainer(container);
-
-        if ((action == 'start') && (state == 'stopped')) {
-            containerName.start();
-        } else if ((action == 'start') && (state == 'paused')) {
-            containerName.unpause();
-        } else if ((action == 'stop') && (state != 'stopped')) {
-            containerName.stop();
-        } else if ((action == 'pause') && (state == 'running')) {
-            containerName.pause();
-        } else if ((action == 'pause') && (state == 'paused')) {
-            containerName.unpause();
-        } else if (action == 'restart') {
-            containerName.restart();
-        }
-    } else {
-        console.log('User is not an admin');
-    }
-}
-
-
-
-
-