@cocreate/cli 1.45.2 → 1.46.0

package/CHANGELOG.md

@@ -1,3 +1,25 @@
+# [1.46.0](https://github.com/CoCreate-app/CoCreate-cli/compare/v1.45.3...v1.46.0) (2023-12-31)
+
+
+### Bug Fixes
+
+* relocated to '@cocreate/webpack' ([05941f1](https://github.com/CoCreate-app/CoCreate-cli/commit/05941f1370f5b91f2968d90e12cd1780b9e2b31f))
+* relocated to thier relative modules ([3635e50](https://github.com/CoCreate-app/CoCreate-cli/commit/3635e50076ee2763aed28194c2b4d099591f82ce))
+* require '@cocreate/nginx' ([acab9d3](https://github.com/CoCreate-app/CoCreate-cli/commit/acab9d3da10de5193dd573ad7198b7356ed35283))
+
+
+### Features
+
+* add '@cocreate/acme' and '@cocreate/nginx' ([0eb81e8](https://github.com/CoCreate-app/CoCreate-cli/commit/0eb81e88a54931bc2fc78663393b15338a62740f))
+* coc acme to manage certs ([13049fa](https://github.com/CoCreate-app/CoCreate-cli/commit/13049fa7316269d1fc64b0f9c378b10937c0e7b7))
+
+## [1.45.3](https://github.com/CoCreate-app/CoCreate-cli/compare/v1.45.2...v1.45.3) (2023-12-18)
+
+
+### Bug Fixes
+
+* coc upload with no args ([a638868](https://github.com/CoCreate-app/CoCreate-cli/commit/a638868b991f39c5a3bdcdcf12285d69f43824f6))
+
 ## [1.45.2](https://github.com/CoCreate-app/CoCreate-cli/compare/v1.45.1...v1.45.2) (2023-12-01)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cocreate/cli",
-  "version": "1.45.2",
+  "version": "1.46.0",
   "description": "Polyrepo management bash CLI tool. Run all git commands and yarn commands on multiple repositories. Also includes a few custom macros for cloning, installing, etc.",
   "keywords": [
     "cli",
@@ -55,8 +55,10 @@
     "coc": "src/coc.js"
   },
   "dependencies": {
+    "@cocreate/acme": "^1.0.0",
     "@cocreate/config": "^1.8.0",
     "@cocreate/file": "^1.13.0",
+    "@cocreate/nginx": "^1.0.0",
     "glob": "^7.1.7",
     "prettier": "^2.3.2"
   }

package/src/commands/acme.js

@@ -0,0 +1,25 @@
+const { requestCertificate } = require('@cocreate/acme')
+
+module.exports = async function nginx(repos, args) {
+    let failed = [];
+
+    try {
+        if (args.length) {
+            if (args[0] === 'create') {
+                args.shift()
+                await createServer(args);
+            } else if (args[0] === 'delete') {
+                args.shift()
+                await deleteServer(args);
+            } else
+                await createServer(args);
+        }
+    } catch (err) {
+        failed.push({ name: 'GENERAL', des: err.message });
+        console.error(err.red);
+    } finally {
+        return failed;
+    }
+
+}
+

package/src/commands/nginx.js

@@ -1,4 +1,4 @@
-const {createServer, deleteServer} = require('./other/nginxConfigManager.js')
+const { createServer, deleteServer } = require('@cocreate/nginx')
 
 module.exports = async function nginx(repos, args) {
     let failed = [];
@@ -11,13 +11,13 @@ module.exports = async function nginx(repos, args) {
             } else if (args[0] === 'delete') {
                 args.shift()
                 await deleteServer(args);
-             } else
+            } else
                 await createServer(args);
         }
     } catch (err) {
         failed.push({ name: 'GENERAL', des: err.message });
         console.error(err.red);
-    } finally  {
+    } finally {
         return failed;
     }
 

package/src/commands/other/nginxConfigManager.js

@@ -107,4 +107,25 @@ async function deleteServer(hosts) {
     return response
 }
 
+async function hasServer(hosts) {
+    if (!Array.isArray(hosts))
+        hosts = [hosts]
+    for (let host of hosts) {
+        const { stdout, stderr } = await exec(`grep -Ri 'server_name.*${host}' /etc/nginx/sites-enabled`)
+        if (err) {
+            console.error(`exec error: ${err}`);
+            return;
+        }
+        if (stdout) {
+            console.log(`Host found in the following configuration file(s):\n${stdout}`);
+
+        } else {
+            console.log('Host not found in Nginx configurations.');
+        }
+
+        if (stderr) console.error(`stderr: ${stderr}`);
+
+    }
+}
+
 module.exports = { createServer, deleteServer }

package/src/commands/upload.js

@@ -28,65 +28,62 @@ module.exports = async function upload(directory, args) {
         console.log('Watching: ', directory)
         fs.watch(directory, { recursive: true }, async (eventType, filename) => {
             if (!filename.includes('CoCreate.config.js')) {
-                const filePath = path.resolve(directory, filename);
-                if (!filePath.includes('node_modules')) {
-                    const configPath = findClosestConfig(filePath);
-                    if (configPath) {
-                        const config = require(configPath);
-
-                        if (config) {
-                            await file(config, configPath, filePath)
-                        } else {
-                            console.log('Failed to read or parse CoCreate.config.js.');
-                        }
-                    } else {
-                        console.log('No CoCreate.config file found in parent directories.');
-                    }
+                const { config, configPath, filePath } = await getConfig(directory, filename);
+                if (config) {
+                    await file(config, configPath, filePath)
+                } else {
+                    console.log('Failed to read or parse CoCreate.config.js.');
                 }
             }
         });
 
     } else {
-        let CoCreateConfig
         if (!args.length) {
-            let configPath = path.resolve(process.cwd(), 'CoCreate.config.js');
-            if (!CoCreateConfig && fs.existsSync(configPath)) {
-                CoCreateConfig = require(configPath);
+            directory = process.cwd()
+            const { config, configPath, filePath } = await getConfig(directory);
+            if (config) {
+                await file(config, configPath, filePath)
             } else {
-                console.log('CoCreate.config.js could not be found.')
-                process.exit()
+                console.log('Failed to read or parse CoCreate.config.js.');
             }
 
-            await file(CoCreateConfig, configPath)
-
         } else {
             for (let arg of args) {
+                let CoCreateConfig
+
                 try {
                     CoCreateConfig = JSON.parse(arg)
                 } catch (error) { }
 
 
                 if (!CoCreateConfig) {
-                    try {
-                        let configPath = path.resolve(process.cwd(), arg)
-                        if (fs.existsSync(configPath)) {
-                            CoCreateConfig = require(configPath);
-                            if (CoCreateConfig)
-                                await file(CoCreateConfig, configPath)
-
-                        } else {
-                            console.log(arg + ' could not be found.')
-                            process.exit()
-                        }
-
-                    } catch (error) { }
+                    const { config, configPath, filePath } = await getConfig(arg);
+                    if (config) {
+                        await file(config, configPath, filePath)
+                    } else {
+                        console.log('Failed to read or parse CoCreate.config.js.');
+                    }
                 }
             }
         }
     }
 
+    async function getConfig(directory, filename = '') {
+        const filePath = path.resolve(directory, filename);
+        if (!filePath.includes('node_modules')) {
+            const configPath = findClosestConfig(filePath)
+            if (configPath) {
+                return { config: require(configPath), configPath, filePath };
+
+            } else {
+                console.log('No CoCreate.config file found in parent directories.');
+            }
+        }
+
+    }
+
     function findClosestConfig(filePath) {
-        let currentDir = path.dirname(filePath);
+        let currentDir = filePath;
 
         while (currentDir !== '/' && currentDir !== '.') {
             let configFile = path.join(currentDir, 'CoCreate.config.js');

package/src/commands/other/certBotWildcard.js

@@ -1,69 +0,0 @@
-#!/usr/bin/env node
-
-const { spawn } = require('child_process');
-
-function runCertbot() {
-    return new Promise((resolve, reject) => {
-        const certbotProcess = spawn('sudo', [
-            'certbot',
-            'certonly',
-            '--manual',
-            '-d', '*.cocreate.zone',
-            '-d', 'cocreate.zone',
-            '--agree-tos',
-            '-m', 'admin@cocreate.zone',
-            '--preferred-challenges', 'dns-01',
-            '--server', 'https://acme-v02.api.letsencrypt.org/directory'
-        ]);
-
-        // let promptsCount = 0;
-
-        certbotProcess.stdout.on('data', (data) => {
-            const output = data.toString();
-            if (output.includes('Please deploy a DNS TXT record under the name:')) {
-                const namePattern = /Please deploy a DNS TXT record under the name:\s+([\w\.-]+)\./;
-                const valuePattern = /with the following value:\s+([\w\d]+)\s+/;
-
-                const nameMatch = output.match(namePattern);
-                const valueMatch = output.match(valuePattern);
-
-                if (nameMatch && valueMatch) {
-                    const name = nameMatch[1];
-                    const value = valueMatch[1];
-
-                    console.log("Name:", name);
-                    console.log("Value:", value);
-                } else {
-                    console.log("Name or value not found in the text.");
-                }
-                // TODO: send name and value to client and wait for clients response before continuing
-                certbotProcess.stdin.write('\n');
-            } else if (output.includes('Press Enter to Continue')) {
-                certbotProcess.stdin.write('\n');
-            }
-        });
-
-        certbotProcess.stderr.on('data', (data) => {
-            reject(data.toString());
-        });
-
-        certbotProcess.on('close', (code) => {
-            if (code === 0) {
-                resolve('Certbot process completed successfully.');
-            } else {
-                reject(`Certbot process exited with code ${code}`);
-            }
-        });
-    });
-}
-
-async function executeCertbot() {
-    try {
-        const result = await runCertbot();
-        console.log(result);
-    } catch (error) {
-        console.error('An error occurred:', error);
-    }
-}
-
-executeCertbot();

package/src/commands/other/haproxy.js

@@ -1,76 +0,0 @@
-const fs = require('fs');
-const { exec } = require('child_process');
-
-const haproxyConfigPath = '/etc/haproxy/haproxy.cfg';
-const backendSectionName = 'backend app_backend';
-
-// Function to update HAProxy config with new servers
-const updateHAProxyConfig = (newServers) => {
-    fs.readFile(haproxyConfigPath, 'utf8', (err, data) => {
-        if (err) {
-            console.error('Error reading HAProxy config:', err);
-            return;
-        }
-
-        const updatedConfig = updateBackendServers(data, newServers);
-        fs.writeFile(haproxyConfigPath, updatedConfig, 'utf8', (err) => {
-            if (err) {
-                console.error('Error writing updated HAProxy config:', err);
-                return;
-            }
-
-            reloadHAProxy();
-        });
-    });
-};
-
-// Function to replace backend server entries in the config
-const updateBackendServers = (configData, newServers) => {
-    const lines = configData.split('\n');
-    let backendSectionStart = -1;
-    let backendSectionEnd = -1;
-
-    // Find the start and end of the backend section
-    lines.forEach((line, index) => {
-        if (line.trim() === backendSectionName) {
-            backendSectionStart = index;
-        }
-        if (backendSectionStart !== -1 && backendSectionEnd === -1 && line.trim() === '') {
-            backendSectionEnd = index;
-        }
-    });
-
-    if (backendSectionStart === -1 || backendSectionEnd === -1) {
-        console.error('Backend section not found in HAProxy config');
-        return configData;
-    }
-
-    // Replace the server list in the backend section
-    const newServerLines = newServers.map(server => `    server ${server.name} ${server.address} check`);
-    const updatedLines = [
-        ...lines.slice(0, backendSectionStart + 1),
-        ...newServerLines,
-        ...lines.slice(backendSectionEnd)
-    ];
-
-    return updatedLines.join('\n');
-};
-
-// Function to reload HAProxy
-const reloadHAProxy = () => {
-    exec('systemctl reload haproxy', (err, stdout, stderr) => {
-        if (err) {
-            console.error('Error reloading HAProxy:', err);
-            return;
-        }
-        console.log('HAProxy reloaded successfully');
-    });
-};
-
-// Example usage
-const newServers = [
-    { name: 'app1', address: '10.0.0.1:80' },
-    { name: 'app2', address: '10.0.0.2:80' }
-];
-
-updateHAProxyConfig(newServers);

package/src/commands/other/haproxyConfigManager.js

@@ -1,63 +0,0 @@
-const fs = require('fs');
-const { exec } = require('child_process');
-
-const haproxyConfigPath = '/etc/haproxy/haproxy.cfg';
-
-// Function to add a new configuration to HAProxy and restart it
-const addHAProxyConfig = (frontendName, backendName, backendServers) => {
-    fs.readFile(haproxyConfigPath, 'utf8', (err, data) => {
-        if (err) {
-            console.error('Error reading HAProxy config:', err);
-            return;
-        }
-
-        // Append new frontend and backend configuration
-        const newConfig = `
-# Frontend Configuration
-frontend ${frontendName}
-    bind *:80
-    mode http
-    default_backend ${backendName}
-
-# Backend Configuration
-backend ${backendName}
-    mode http
-    balance roundrobin`;
-
-        // Add server entries
-        backendServers.forEach((server, index) => {
-            newConfig += `\n    server server${index} ${server.address} check`;
-        });
-
-        // Write updated configuration
-        fs.writeFile(haproxyConfigPath, data + newConfig, 'utf8', (err) => {
-            if (err) {
-                console.error('Error writing updated HAProxy config:', err);
-                return;
-            }
-
-            restartHAProxy();
-        });
-    });
-};
-
-// Function to restart HAProxy
-const restartHAProxy = () => {
-    exec('systemctl restart haproxy', (err, stdout, stderr) => {
-        if (err) {
-            console.error('Error restarting HAProxy:', err);
-            return;
-        }
-        console.log('HAProxy restarted successfully');
-    });
-};
-
-// Example usage
-const frontendName = 'my_frontend';
-const backendName = 'my_backend';
-const backendServers = [
-    { address: '10.0.0.1:80' },
-    { address: '10.0.0.2:80' }
-];
-
-addHAProxyConfig(frontendName, backendName, backendServers);

package/src/commands/other/nginx.js

@@ -1,76 +0,0 @@
-const fs = require('fs');
-const { exec } = require('child_process');
-
-const nginxConfigPath = '/etc/nginx/conf.d/myapp.conf';
-const upstreamBlockName = 'upstream app_backend';
-
-// Function to update NGINX config with new servers
-const updateNginxConfig = (newServers) => {
-    fs.readFile(nginxConfigPath, 'utf8', (err, data) => {
-        if (err) {
-            console.error('Error reading NGINX config:', err);
-            return;
-        }
-
-        const updatedConfig = updateUpstreamServers(data, newServers);
-        fs.writeFile(nginxConfigPath, updatedConfig, 'utf8', (err) => {
-            if (err) {
-                console.error('Error writing updated NGINX config:', err);
-                return;
-            }
-
-            reloadNginx();
-        });
-    });
-};
-
-// Function to replace upstream server entries in the config
-const updateUpstreamServers = (configData, newServers) => {
-    const lines = configData.split('\n');
-    let upstreamSectionStart = -1;
-    let upstreamSectionEnd = -1;
-
-    // Find the start and end of the upstream section
-    lines.forEach((line, index) => {
-        if (line.trim().startsWith(upstreamBlockName)) {
-            upstreamSectionStart = index;
-        }
-        if (upstreamSectionStart !== -1 && upstreamSectionEnd === -1 && line.trim() === '}') {
-            upstreamSectionEnd = index;
-        }
-    });
-
-    if (upstreamSectionStart === -1 || upstreamSectionEnd === -1) {
-        console.error('Upstream section not found in NGINX config');
-        return configData;
-    }
-
-    // Replace the server list in the upstream section
-    const newServerLines = newServers.map(server => `    server ${server.address};`);
-    const updatedLines = [
-        ...lines.slice(0, upstreamSectionStart + 1),
-        ...newServerLines,
-        ...lines.slice(upstreamSectionEnd)
-    ];
-
-    return updatedLines.join('\n');
-};
-
-// Function to reload NGINX
-const reloadNginx = () => {
-    exec('systemctl reload nginx', (err, stdout, stderr) => {
-        if (err) {
-            console.error('Error reloading NGINX:', err);
-            return;
-        }
-        console.log('NGINX reloaded successfully');
-    });
-};
-
-// Example usage
-const newServers = [
-    { address: '10.0.0.1:80' },
-    { address: '10.0.0.2:80' }
-];
-
-updateNginxConfig(newServers);

package/src/commands/other/nodeCertManager.js

@@ -1,182 +0,0 @@
-const util = require('node:util');
-const exec = require('node:child_process').exec;
-const dns = require('dns');
-const child_process = require('child_process');
-const spawn = child_process.spawn;
-
-const localip = '3.231.17.247'
-const certificates = new Map()
-const certbotPath = `/etc/letsencrypt/live/`;
-const fullchainPath = `${certbotPath}/fullchain.pem`;
-const privkeyPath = `${certbotPath}/privkey.pem`;
-const combinedPath = `${certbotPath}/haproxy.pem`;
-
-
-async function checkDns(host) {
-    return new Promise((resolve, reject) => {
-
-        try {
-            dns.resolve(host, 'A', (err, records) => {
-                if (records && records[0] === localip) {
-                    resolve(true)
-                } else {
-                    console.log('host A record need to point to', localip)
-                    resolve(false)
-                }
-                if (err)
-                    console.log(host, err);
-            });
-        } catch (err) {
-            console.log('certificate', err)
-        }
-    });
-}
-
-async function createCert(host) {
-    try {
-        // let hosts = await exec(`sudo openssl x509 -dates -noout -in /etc/letsencrypt/live/${host}/fullchain.pem`);
-        // console.log('hostst check', hosts)
-        let test = await checkDns(host)
-        console.log('checked dns from createCert', test)
-        if (test) {
-            await exec(`sudo certbot certonly -d ${host}`);
-            // let exitCode = await spawn('sudo', ['certbot', 'certonly', '--manual', '-d', `*.${host}`, '-d', host, '--agree-tos', '--preferred-challenges', 'dns-01', '--server', 'https://acme-v02.api.letsencrypt.org/directory'], { stdio: 'inherit', cwd: process.cwd() })
-            if (exitCode !== 0) {
-                failed.push({ name: false, des: `creating directory failed` })
-            } else
-                console.log(true)
-
-            // return true
-        } else
-            return false
-    } catch (err) {
-        return false
-    }
-}
-
-async function deleteCert(host) {
-    try {
-        await exec(`sudo certbot delete --cert-name ${host}`);
-        return true
-    } catch (err) {
-        return false
-    }
-}
-
-async function checkCert(host) {
-    try {
-        let hosts = await exec(`host ${host}`);
-        console.log('hostst check', hosts)
-
-        if (certificates.has(host))
-            return true
-        else {
-            let certs = await exec(`sudo openssl x509 -dates -noout -in /etc/letsencrypt/live/${host}/fullchain.pem`);
-            let cert = certs.stdout.split('\n')
-            let issued = Date.parse(cert[0].replace('notBefore=', ''))
-            let expires = Date.parse(cert[1].replace('notAfter=', ''))
-            let currentDate = new Date()
-
-            if (!issued || !expires)
-                console.log('not defined', { issued, expires })
-            else if (!isNaN(expires)) {
-                if (currentDate < expires) {
-                    certificates.set(host, { issued, expires })
-                    return true
-                } else {
-                    let cert = await createCert(host)
-                    return cert
-                }
-            } else {
-                let cert = await createCert(host)
-                return cert
-            }
-        }
-    } catch (err) {
-        let cert = await createCert(host)
-        if (cert)
-            certificates.set(host, { issued, expires })
-        return cert
-    }
-}
-
-const combineCertificate = (host) => {
-    const certbotPath = `/etc/letsencrypt/live/${host}`;
-    const fullchainPath = `${certbotPath}/fullchain.pem`;
-    const privkeyPath = `${certbotPath}/privkey.pem`;
-    const combinedPath = `${certbotPath}/haproxy.pem`;
-
-    fs.readFile(fullchainPath, (err, fullchainData) => {
-        if (err) {
-            console.error('Error reading fullchain.pem:', err);
-            return;
-        }
-
-        fs.readFile(privkeyPath, (err, privkeyData) => {
-            if (err) {
-                console.error('Error reading privkey.pem:', err);
-                return;
-            }
-
-            const combinedData = `${fullchainData}\n${privkeyData}`;
-            fs.writeFile(combinedPath, combinedData, (err) => {
-                if (err) {
-                    console.error('Error writing combined haproxy.pem:', err);
-                } else {
-                    console.log('Successfully combined certificates for HAProxy.');
-                }
-            });
-        });
-    });
-};
-
-async function test(host) {
-    try {
-
-
-        await exec(`sudo certbot certonly --manual --test-cert -d *.${host} -d  ${host} --agree-tos --preferred-challenges dns-01 --server https://acme-v02.api.letsencrypt.org/directory`);
-        let exitCode = await spawn('sudo', ['certbot', 'certonly', '--manual', '--test-cert', '-d', `*.${host}`, '-d', host, '--agree-tos', '--preferred-challenges', 'dns-01', '--server', 'https://acme-v02.api.letsencrypt.org/directory'], { stdio: 'inherit', cwd: process.cwd() })
-        if (exitCode !== 0) {
-            failed.push({ name: false, des: `creating directory failed` })
-        } else
-            console.log(true)
-
-        // let child = exec('su -')
-        // child.stdin.write("testserver\n");
-
-        // child.stdout.on('data', (data) => {
-        //     console.log(`stdout: "${data}"`);
-        // });
-
-        // child.stdin.end(); // EOF
-
-        // child.on('close', (code) => {
-        //     console.log(`Child process exited with code ${code}.`);
-        // });
-
-        // exitCode.on("data", data => {
-        //     console.log('test')
-        // })
-        // let test = exitCode
-        // if (exitCode !== 0) {
-        //     exitCode.write('test', (err) => {
-        //         if (err) throw Error(err.message)
-        //     })
-        // } else {
-        //     exitCode.write('test', (err) => {
-        //         if (err) throw Error(err.message)
-        //     })
-        // }
-
-        // return true
-        // return false
-    } catch (err) {
-        process.exit(1)
-        //    return false
-    }
-}
-
-
-// test('cocreate.app')
-
-module.exports = { checkDns, checkCert, createCert, deleteCert }

package/src/loaders/replace-unicode.js

@@ -1,3 +0,0 @@
-module.exports = function (source) {
-    return source.replace(/\$'/g, '\\u0024\'');
-};