@cocreate/cli 1.28.4 → 1.29.0

package/src/commands/other/nginxConfigManager.js

@@ -1,138 +1,138 @@
-const util = require('node:util');
-const exec = util.promisify(require('node:child_process').exec);
-let fs = require('fs');
-
-const available = "/etc/nginx/sites-available/"
-const enabled = "/etc/nginx/sites-enabled/"
-
-async function createServer(hosts) {
-    const response = {}
-    if (!Array.isArray(hosts))
-        hosts = [hosts]
-
-    for (let host of hosts) {
-        const hostParts = host.split('.')
-        const domain = hostParts[0];
-        const tld =  hostParts[1];
-        const server = `
-server {
-    server_name  ~^(?<sub>.+)\.${domain}\.${tld} ${host};
-  
-    location / {
-            proxy_pass http://localhost:3000;
-            proxy_set_header Host $host;
-            proxy_set_header X-Real-IP $remote_addr;
-            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-            proxy_set_header X-Forwarded-Proto $scheme;
-            fastcgi_buffers 16 16k;
-            fastcgi_buffer_size 32k;
-            proxy_buffer_size 128k;
-            proxy_buffers 4 256k;
-            proxy_busy_buffers_size 256k;
-
-    }
-
-    location /ws/ {
-            proxy_pass http://localhost:3000;
-            proxy_set_header Host $host;
-            proxy_set_header X-Real-IP $remote_addr;
-            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-            proxy_set_header X-Forwarded-Proto $scheme;
-            proxy_set_header Upgrade $http_upgrade;
-            proxy_set_header Connection "Upgrade";
-            fastcgi_buffers 16 16k;
-            fastcgi_buffer_size 32k;
-            proxy_buffer_size 128k;
-            proxy_buffers 4 256k;
-            proxy_busy_buffers_size 256k;
-
-    }
-
-    location /api/ {
-            proxy_pass http://localhost:3002;
-            proxy_set_header Host $host;
-            proxy_set_header X-Real-IP $remote_addr;
-            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-            proxy_set_header X-Forwarded-Proto $scheme;
-            proxy_set_header Upgrade $http_upgrade;
-            proxy_set_header Connection "Upgrade";
-            fastcgi_buffers 16 16k;
-            fastcgi_buffer_size 32k;
-            proxy_buffer_size 128k;
-            proxy_buffers 4 256k;
-            proxy_busy_buffers_size 256k;
-    }
-
-    listen 443 ssl http2;
-    ssl_certificate /etc/letsencrypt/live/${host}/fullchain.pem;
-    ssl_certificate_key /etc/letsencrypt/live/${host}/privkey.pem;
-  
-}
-
-`;
-        fs.writeFileSync(`${available}${host}`, server)
-      
-        if (!fs.existsSync(`${enabled}${host}`))
-            await exec(`sudo ln -s ${available}${host} ${enabled}`);
-        
-        let test = await exec(`sudo nginx -t`);
-        if (test.stderr.includes('test is successful')) {
-            await exec(`sudo systemctl reload nginx`);
-            console.log(host, 'test passed reloading nginx')
-            response[host] = true
-        } else {
-            console.log(host, 'test failed')
-            response[host] = false
-        }
-    }
-
-
-    if (!fs.existsSync(`${enabled}main`)) {
-        let main = `server {
-            listen 80 default_server;
-            listen [::]:80 default_server;
-        
-        
-            server_name _;
-            return 301 https://$host$request_uri;
-        }`
-        
-        fs.writeFileSync(`${available}main`, main)
-        await exec(`sudo ln -s ${available}main ${enabled}`);
-
-        if (fs.existsSync(`${enabled}default`))
-            fs.unlinkSync(`${enabled}default`)
-        if (fs.existsSync(`${available}default`))
-            fs.unlinkSync(`${available}default`)
-        
-        let test = await exec(`sudo nginx -t`);
-        if (test.stderr.includes('test is successful')) {
-            await exec(`sudo systemctl reload nginx`);
-            console.log('main test passed reloading nginx')
-            response['main'] = true
-        } else {
-            console.log('main test failed')
-            response['main'] = false
-        }
-    
-    }
-
-    return response
-}
-
-async function deleteServer(hosts) {
-    const response = {}
-    if (!Array.isArray(hosts))
-        hosts = [hosts]
-    for (let host of hosts) {
-        if (fs.existsSync(`${enabled}${host}`))
-            fs.unlinkSync(`${enabled}${host}`)
-        if (fs.existsSync(`${available}${host}`))
-            fs.unlinkSync(`${available}${host}`)
-            
-        response[host] = true
-    }
-    return response
-}
-
+const util = require('node:util');
+const exec = util.promisify(require('node:child_process').exec);
+let fs = require('fs');
+
+const available = "/etc/nginx/sites-available/"
+const enabled = "/etc/nginx/sites-enabled/"
+
+async function createServer(hosts) {
+    const response = {}
+    if (!Array.isArray(hosts))
+        hosts = [hosts]
+
+    for (let host of hosts) {
+        const hostParts = host.split('.')
+        const domain = hostParts[0];
+        const tld =  hostParts[1];
+        const server = `
+server {
+    server_name  ~^(?<sub>.+)\.${domain}\.${tld} ${host};
+  
+    location / {
+            proxy_pass http://localhost:3000;
+            proxy_set_header Host $host;
+            proxy_set_header X-Real-IP $remote_addr;
+            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+            proxy_set_header X-Forwarded-Proto $scheme;
+            fastcgi_buffers 16 16k;
+            fastcgi_buffer_size 32k;
+            proxy_buffer_size 128k;
+            proxy_buffers 4 256k;
+            proxy_busy_buffers_size 256k;
+
+    }
+
+    location /ws/ {
+            proxy_pass http://localhost:3000;
+            proxy_set_header Host $host;
+            proxy_set_header X-Real-IP $remote_addr;
+            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+            proxy_set_header X-Forwarded-Proto $scheme;
+            proxy_set_header Upgrade $http_upgrade;
+            proxy_set_header Connection "Upgrade";
+            fastcgi_buffers 16 16k;
+            fastcgi_buffer_size 32k;
+            proxy_buffer_size 128k;
+            proxy_buffers 4 256k;
+            proxy_busy_buffers_size 256k;
+
+    }
+
+    location /api/ {
+            proxy_pass http://localhost:3002;
+            proxy_set_header Host $host;
+            proxy_set_header X-Real-IP $remote_addr;
+            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+            proxy_set_header X-Forwarded-Proto $scheme;
+            proxy_set_header Upgrade $http_upgrade;
+            proxy_set_header Connection "Upgrade";
+            fastcgi_buffers 16 16k;
+            fastcgi_buffer_size 32k;
+            proxy_buffer_size 128k;
+            proxy_buffers 4 256k;
+            proxy_busy_buffers_size 256k;
+    }
+
+    listen 443 ssl http2;
+    ssl_certificate /etc/letsencrypt/live/${host}/fullchain.pem;
+    ssl_certificate_key /etc/letsencrypt/live/${host}/privkey.pem;
+  
+}
+
+`;
+        fs.writeFileSync(`${available}${host}`, server)
+      
+        if (!fs.existsSync(`${enabled}${host}`))
+            await exec(`sudo ln -s ${available}${host} ${enabled}`);
+        
+        let test = await exec(`sudo nginx -t`);
+        if (test.stderr.includes('test is successful')) {
+            await exec(`sudo systemctl reload nginx`);
+            console.log(host, 'test passed reloading nginx')
+            response[host] = true
+        } else {
+            console.log(host, 'test failed')
+            response[host] = false
+        }
+    }
+
+
+    if (!fs.existsSync(`${enabled}main`)) {
+        let main = `server {
+            listen 80 default_server;
+            listen [::]:80 default_server;
+        
+        
+            server_name _;
+            return 301 https://$host$request_uri;
+        }`
+        
+        fs.writeFileSync(`${available}main`, main)
+        await exec(`sudo ln -s ${available}main ${enabled}`);
+
+        if (fs.existsSync(`${enabled}default`))
+            fs.unlinkSync(`${enabled}default`)
+        if (fs.existsSync(`${available}default`))
+            fs.unlinkSync(`${available}default`)
+        
+        let test = await exec(`sudo nginx -t`);
+        if (test.stderr.includes('test is successful')) {
+            await exec(`sudo systemctl reload nginx`);
+            console.log('main test passed reloading nginx')
+            response['main'] = true
+        } else {
+            console.log('main test failed')
+            response['main'] = false
+        }
+    
+    }
+
+    return response
+}
+
+async function deleteServer(hosts) {
+    const response = {}
+    if (!Array.isArray(hosts))
+        hosts = [hosts]
+    for (let host of hosts) {
+        if (fs.existsSync(`${enabled}${host}`))
+            fs.unlinkSync(`${enabled}${host}`)
+        if (fs.existsSync(`${available}${host}`))
+            fs.unlinkSync(`${available}${host}`)
+            
+        response[host] = true
+    }
+    return response
+}
+
 module.exports = {createServer, deleteServer}

package/src/commands/other/nodeCertManager.js

@@ -1,148 +1,148 @@
-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()
-
-
-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 creatCert', test)
-        if (test) {
-            await exec(`sudo certbot certonly --manual -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', '-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
-    }
-}
-
-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')
-
+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()
+
+
+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 creatCert', test)
+        if (test) {
+            await exec(`sudo certbot certonly --manual -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', '-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
+    }
+}
+
+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/commands/other/symlinkPwa.js

@@ -1,39 +1,39 @@
-const fs = require('fs')
-const path = require('path')
-
-function symlink(dir, dest, option) {
-    if (!fs.existsSync(dir)) {
-        return console.log(dir, 'does not exist')
-    } else
-        dir = path.resolve(dir)
-
-    if (fs.existsSync(dest))
-        fs.rm(dest, { recursive: true, force: true }, function (err) {
-            if (err) {
-                console.log('failed');
-            }
-            createSymlink(dir, dest, option)
-        });
-    else
-        createSymlink(dir, dest, option)
-}
-
-function createSymlink(dir, dest, option) {
-    dest = path.resolve(dest)
-
-    fs.symlink(dir, dest, option, (err) => {
-        console.log(dir, dest, option)
-        if (err)
-            console.log(err);
-        else {
-            console.log("symlink added");
-        }
-
-    })
-
-}
-
-symlink('./src/assets', '../assets', 'dir')
-symlink('./src/manifest.webmanifest', '../manifest.webmanifest', 'file')
-symlink('./src/sw.js', '../sw.js', 'file')
+const fs = require('fs')
+const path = require('path')
+
+function symlink(dir, dest, option) {
+    if (!fs.existsSync(dir)) {
+        return console.log(dir, 'does not exist')
+    } else
+        dir = path.resolve(dir)
+
+    if (fs.existsSync(dest))
+        fs.rm(dest, { recursive: true, force: true }, function (err) {
+            if (err) {
+                console.log('failed');
+            }
+            createSymlink(dir, dest, option)
+        });
+    else
+        createSymlink(dir, dest, option)
+}
+
+function createSymlink(dir, dest, option) {
+    dest = path.resolve(dest)
+
+    fs.symlink(dir, dest, option, (err) => {
+        console.log(dir, dest, option)
+        if (err)
+            console.log(err);
+        else {
+            console.log("symlink added");
+        }
+
+    })
+
+}
+
+symlink('./src/assets', '../assets', 'dir')
+symlink('./src/manifest.webmanifest', '../manifest.webmanifest', 'file')
+symlink('./src/sw.js', '../sw.js', 'file')
 symlink('./src/offline.html', '../offline.html', 'file')