underpost 2.7.1 → 2.7.2

package/bin/shortcut.js

@@ -1,44 +1,44 @@
-import fs from 'fs';
-import { getRootDirectory, shellExec } from '../src/server/process.js';
-import os from 'os';
-
-const [exe, dir, oS, env] = process.argv;
-
-switch (oS) {
-  case 'windows':
-    switch (env) {
-      case 'development':
-        (() => {
-          const desktopDir = `${os.homedir()}/desktop`.replaceAll('\\', '/');
-          fs.writeFileSync(
-            `./bin/shortcut.ps1`,
-            `
-          $DesktopPath = [Environment]::GetFolderPath("Desktop") + "/${env}-engine.lnk"  
-
-          $WshShell = New-Object -comObject WScript.Shell 
-
-          $Shortcut = $WshShell.CreateShortcut($DesktopPath) 
-
-          $Shortcut.TargetPath = "cmd.exe"
-        
-          $Shortcut.Arguments = "PowerShell Start-Process cmd -Verb RunAs -ArgumentList '/k cd ${getRootDirectory()} && npm run dev" 
-
-          $Shortcut.IconLocation = "${getRootDirectory()}/src/client/public/doc/favicon.ico"
-
-          $Shortcut.Save()
-          `,
-          );
-          shellExec(`PowerShell bin/shortcut.ps1`);
-          fs.unlinkSync(`./bin/shortcut.ps1`);
-        })();
-        break;
-
-      default:
-        break;
-    }
-
-    break;
-
-  default:
-    break;
-}
+import fs from 'fs';
+import { getRootDirectory, shellExec } from '../src/server/process.js';
+import os from 'os';
+
+const [exe, dir, oS, env] = process.argv;
+
+switch (oS) {
+  case 'windows':
+    switch (env) {
+      case 'development':
+        (() => {
+          const desktopDir = `${os.homedir()}/desktop`.replaceAll('\\', '/');
+          fs.writeFileSync(
+            `./bin/shortcut.ps1`,
+            `
+          $DesktopPath = [Environment]::GetFolderPath("Desktop") + "/${env}-engine.lnk"  
+
+          $WshShell = New-Object -comObject WScript.Shell 
+
+          $Shortcut = $WshShell.CreateShortcut($DesktopPath) 
+
+          $Shortcut.TargetPath = "cmd.exe"
+        
+          $Shortcut.Arguments = "PowerShell Start-Process cmd -Verb RunAs -ArgumentList '/k cd ${getRootDirectory()} && npm run dev" 
+
+          $Shortcut.IconLocation = "${getRootDirectory()}/src/client/public/doc/favicon.ico"
+
+          $Shortcut.Save()
+          `,
+          );
+          shellExec(`PowerShell bin/shortcut.ps1`);
+          fs.unlinkSync(`./bin/shortcut.ps1`);
+        })();
+        break;
+
+      default:
+        break;
+    }
+
+    break;
+
+  default:
+    break;
+}

package/bin/ssl.js

@@ -1,64 +1,65 @@
-import fs from 'fs';
-import read from 'read';
-import ncp from 'copy-paste';
-import dotenv from 'dotenv';
-
-import { getRootDirectory } from '../src/server/process.js';
-import { loggerFactory } from '../src/server/logger.js';
-import { loadConf } from '../src/server/conf.js';
-import { buildSSL } from '../src/server/ssl.js';
-
-dotenv.config();
-
-const logger = loggerFactory(import.meta);
-
-await logger.setUpInfo();
-
-// usage
-// node bin/ssl windows <deploy-id> www.example.com
-
-const [exe, dir, os, deployId, hosts] = process.argv;
-
-try {
-  let cmd;
-  await loadConf(deployId);
-  const confServer = JSON.parse(fs.readFileSync(`./conf/conf.server.json`, 'utf8'));
-  for (const host of hosts.split(',')) {
-    if (host in confServer) {
-      const directory = confServer[host]['/']?.['directory'] ? confServer[host]['/']['directory'] : undefined;
-      cmd = `certbot certonly --webroot --webroot-path ${
-        directory ? directory : `${getRootDirectory()}/public/${host}`
-      } -d ${host}`;
-      // directory ? directory : `${getRootDirectory()}/public/${host}`
-      // directory ? directory : `${getRootDirectory()}/public/www.${host.split('.').slice(-2).join('.')}`
-
-      // You can get multi domain cert by specifying (extra) -d
-      // For example
-      // certbot -d example.com -d example.net -d www.example.org
-
-      // delete all file (no increment live folder)
-      // certbot delete --cert-name <domain>
-
-      logger.info(`Run the following command`, cmd);
-      await ncp.copy(cmd);
-      await read({ prompt: 'Command copy to clipboard, press enter to continue.\n' });
-      // Certificate
-      switch (os) {
-        case 'windows':
-          await buildSSL(host);
-          break;
-
-        default:
-          break;
-      }
-      logger.info('Certificate saved', host);
-    } else throw new Error(`host not found: ${host}`);
-  }
-
-  cmd = `certbot renew --dry-run`;
-  await ncp.copy(cmd);
-  logger.info(`run the following command for renewal. Command copy to clipboard`, cmd);
-  logger.info(`success install SLL`, hosts);
-} catch (error) {
-  logger.error(error, error.stack);
-}
+import fs from 'fs';
+import read from 'read';
+import ncp from 'copy-paste';
+import dotenv from 'dotenv';
+
+import { getRootDirectory, shellExec } from '../src/server/process.js';
+import { loggerFactory } from '../src/server/logger.js';
+import { Cmd, loadConf } from '../src/server/conf.js';
+import { buildSSL } from '../src/server/ssl.js';
+
+dotenv.config();
+
+const logger = loggerFactory(import.meta);
+
+await logger.setUpInfo();
+
+// usage
+// node bin/ssl windows <deploy-id> www.example.com
+
+const [exe, dir, os, deployId, hosts] = process.argv;
+
+try {
+  let cmd;
+  await loadConf(deployId);
+  shellExec(Cmd.conf(deployId));
+  const confServer = JSON.parse(fs.readFileSync(`./conf/conf.server.json`, 'utf8'));
+  for (const host of hosts.split(',')) {
+    if (host in confServer) {
+      const directory = confServer[host]['/']?.['directory'] ? confServer[host]['/']['directory'] : undefined;
+      cmd = `certbot certonly --webroot --webroot-path ${
+        directory ? directory : `${getRootDirectory()}/public/${host}`
+      } -d ${host}`;
+      // directory ? directory : `${getRootDirectory()}/public/${host}`
+      // directory ? directory : `${getRootDirectory()}/public/www.${host.split('.').slice(-2).join('.')}`
+
+      // You can get multi domain cert by specifying (extra) -d
+      // For example
+      // certbot -d example.com -d example.net -d www.example.org
+
+      // delete all file (no increment live folder)
+      // certbot delete --cert-name <domain>
+
+      logger.info(`Run the following command`, cmd);
+      await ncp.copy(cmd);
+      await read({ prompt: 'Command copy to clipboard, press enter to continue.\n' });
+      // Certificate
+      switch (os) {
+        case 'windows':
+          await buildSSL(host);
+          break;
+
+        default:
+          break;
+      }
+      logger.info('Certificate saved', host);
+    } else throw new Error(`host not found: ${host}`);
+  }
+
+  cmd = `certbot renew --dry-run`;
+  await ncp.copy(cmd);
+  logger.info(`run the following command for renewal. Command copy to clipboard`, cmd);
+  logger.info(`success install SLL`, hosts);
+} catch (error) {
+  logger.error(error, error.stack);
+}

package/bin/util.js

@@ -1,182 +1,182 @@
-import fs from 'fs-extra';
-import merge from 'deepmerge';
-import si from 'systeminformation';
-import * as dir from 'path';
-import { svg } from 'font-awesome-assets';
-
-import { loggerFactory } from '../src/server/logger.js';
-import { shellCd, shellExec } from '../src/server/process.js';
-import { range, s4 } from '../src/client/components/core/CommonJs.js';
-import { network } from '../src/server/network.js';
-import { Config } from '../src/server/conf.js';
-import { FileFactory } from '../src/api/file/file.service.js';
-import { buildTextImg, faBase64Png, getBufferPngText } from '../src/server/client-icons.js';
-
-const logger = loggerFactory(import.meta);
-
-logger.info('argv', process.argv);
-
-const operator = process.argv[2];
-
-try {
-  // let cmd;
-  switch (operator) {
-    case 'cls':
-      fs.removeSync('./public');
-      fs.removeSync('./logs');
-      fs.removeSync('./conf');
-      //   fs.removeSync('./engine-private');
-      //   fs.removeSync('./node_modules');
-      break;
-    case 'log':
-      (() => {
-        const logPath = `./logs/${process.argv[3]}/${process.argv[4]}.log`;
-        logger.info('Read', logPath);
-        console.log(fs.readFileSync(logPath, 'utf8'));
-      })();
-      break;
-    case 'kill-ports':
-      if (!process.argv[3]) process.argv[3] = '22,80,443,3000-3020';
-      for (const port of process.argv[3].split(',')) {
-        const rangePort = port.split('-');
-        if (rangePort[1])
-          for (const port of range(parseInt(rangePort[0]), parseInt(rangePort[1]))) {
-            logger.info('clean port', port);
-            await network.port.portClean(port);
-          }
-        else {
-          logger.info('clean port', parseInt(port));
-          await network.port.portClean(port);
-        }
-      }
-      break;
-    case 'system-info':
-      await (async () => {
-        for (const infoKey of Object.keys(si)) {
-          if (typeof si[infoKey] === 'function') {
-            //  'dockerInfo', 'vboxInfo'
-            if (!['osInfo', 'graphics', 'cpu'].includes(infoKey)) continue;
-            try {
-              const infoInstance = await si[infoKey]();
-              logger.info(infoKey, infoInstance);
-            } catch (error) {
-              logger.info('Not valid info function', infoKey);
-            }
-          }
-        }
-      })();
-      break;
-    case 'export-git-changes':
-      {
-        const baseFrom = process.argv[3];
-        const baseTo = process.argv[4];
-        // if (fs.existsSync(baseTo)) fs.removeSync(baseTo);
-        shellCd(baseFrom);
-        {
-          try {
-            let output = shellExec('git status', { silent: true, stdout: true });
-            console.log('output:', output);
-            output = output
-              .split(`to discard changes in working directory)`)[1]
-              .split(`Untracked files:`)[0]
-              .split('modified:')
-              .map((c) => c.trim().replaceAll(`\n`, ''));
-            output[output.length - 1] = output[output.length - 1].split('no changes added to commit')[0];
-            output.shift();
-            for (const fromPath of output) {
-              const from = `${baseFrom}/${fromPath}`;
-              const to = `${baseTo}/${fromPath}`;
-              logger.info('Copy path', { from, to });
-              fs.copySync(from, to);
-            }
-          } catch (error) {
-            logger.error(error);
-          }
-        }
-        {
-          try {
-            let output = shellExec('git status', { silent: true, stdout: true });
-            console.log('output:', output);
-            output = output
-              .split(`to include in what will be committed)`)[1]
-              .split(`no changes added to commit`)[0]
-              .split(`\n`)
-              .map((l) => l.trim())
-              .filter((l) => l);
-
-            for (const fromPath of output) {
-              const from = `${baseFrom}/${fromPath}`;
-              const to = `${baseTo}/${fromPath}`;
-              logger.info('Copy path', { from, to });
-              fs.copySync(from, to);
-            }
-          } catch (error) {
-            logger.error(error);
-          }
-        }
-      }
-      break;
-    case 'delete-empty-folder':
-      function cleanEmptyFoldersRecursively(folder) {
-        const isDir = fs.statSync(folder).isDirectory();
-        if (!isDir) return;
-
-        let files = fs.readdirSync(folder);
-        if (files.length > 0) {
-          files.forEach(function (file) {
-            const fullPath = dir.join(folder, file);
-            cleanEmptyFoldersRecursively(fullPath);
-          });
-
-          // re-evaluate files; after deleting subfolder
-          // we may have parent folder empty now
-          files = fs.readdirSync(folder);
-        }
-
-        if (files.length === 0) {
-          console.log('removing: ', folder);
-          fs.rmdirSync(folder);
-          return;
-        }
-      }
-      cleanEmptyFoldersRecursively('./');
-      break;
-
-    case 'text-to-image': {
-      const buffer = await getBufferPngText({
-        text: process.argv[3],
-        textColor: process.argv[4],
-        bgColor: process.argv[5],
-        size: process.argv[6],
-        debugFilename: process.argv[7],
-      });
-      fs.writeFileSync(`./text-to-image.png`, buffer);
-      break;
-    }
-    case 'fa-image':
-      const faId = process.argv[3] ? process.argv[3] : 'user';
-      const color = process.argv[4] ? process.argv[4] : '#5f5f5f';
-      const path = process.argv[5] ? process.argv[5] : './';
-
-      {
-        fs.writeFileSync(`./tmp/${faId}.svg`, svg(faId, color), 'utf8');
-        const data = fs.readFileSync(`./tmp/${faId}.svg`);
-        console.log(FileFactory.svg(data, `${faId}.svg`));
-        fs.removeSync(`${path}${faId}.svg`);
-      }
-      {
-        fs.writeFileSync(`${path}${faId}.png`, Buffer.from(faBase64Png(faId, 100, 100, color), 'base64'));
-      }
-
-      break;
-
-    case 'b64-image':
-      fs.writeFileSync('b64-image', `data:image/jpg;base64,${fs.readFileSync(process.argv[3]).toString('base64')}`);
-      break;
-
-    default:
-      break;
-  }
-} catch (error) {
-  logger.error(error, error.stack);
-}
+import fs from 'fs-extra';
+import merge from 'deepmerge';
+import si from 'systeminformation';
+import * as dir from 'path';
+import { svg } from 'font-awesome-assets';
+
+import { loggerFactory } from '../src/server/logger.js';
+import { shellCd, shellExec } from '../src/server/process.js';
+import { range, s4 } from '../src/client/components/core/CommonJs.js';
+import { network } from '../src/server/network.js';
+import { Config } from '../src/server/conf.js';
+import { FileFactory } from '../src/api/file/file.service.js';
+import { buildTextImg, faBase64Png, getBufferPngText } from '../src/server/client-icons.js';
+
+const logger = loggerFactory(import.meta);
+
+logger.info('argv', process.argv);
+
+const operator = process.argv[2];
+
+try {
+  // let cmd;
+  switch (operator) {
+    case 'cls':
+      fs.removeSync('./public');
+      fs.removeSync('./logs');
+      fs.removeSync('./conf');
+      //   fs.removeSync('./engine-private');
+      //   fs.removeSync('./node_modules');
+      break;
+    case 'log':
+      (() => {
+        const logPath = `./logs/${process.argv[3]}/${process.argv[4]}.log`;
+        logger.info('Read', logPath);
+        console.log(fs.readFileSync(logPath, 'utf8'));
+      })();
+      break;
+    case 'kill-ports':
+      if (!process.argv[3]) process.argv[3] = '22,80,443,3000-3020';
+      for (const port of process.argv[3].split(',')) {
+        const rangePort = port.split('-');
+        if (rangePort[1])
+          for (const port of range(parseInt(rangePort[0]), parseInt(rangePort[1]))) {
+            logger.info('clean port', port);
+            await network.port.portClean(port);
+          }
+        else {
+          logger.info('clean port', parseInt(port));
+          await network.port.portClean(port);
+        }
+      }
+      break;
+    case 'system-info':
+      await (async () => {
+        for (const infoKey of Object.keys(si)) {
+          if (typeof si[infoKey] === 'function') {
+            //  'dockerInfo', 'vboxInfo'
+            if (!['osInfo', 'graphics', 'cpu'].includes(infoKey)) continue;
+            try {
+              const infoInstance = await si[infoKey]();
+              logger.info(infoKey, infoInstance);
+            } catch (error) {
+              logger.info('Not valid info function', infoKey);
+            }
+          }
+        }
+      })();
+      break;
+    case 'export-git-changes':
+      {
+        const baseFrom = process.argv[3];
+        const baseTo = process.argv[4];
+        // if (fs.existsSync(baseTo)) fs.removeSync(baseTo);
+        shellCd(baseFrom);
+        {
+          try {
+            let output = shellExec('git status', { silent: true, stdout: true });
+            console.log('output:', output);
+            output = output
+              .split(`to discard changes in working directory)`)[1]
+              .split(`Untracked files:`)[0]
+              .split('modified:')
+              .map((c) => c.trim().replaceAll(`\n`, ''));
+            output[output.length - 1] = output[output.length - 1].split('no changes added to commit')[0];
+            output.shift();
+            for (const fromPath of output) {
+              const from = `${baseFrom}/${fromPath}`;
+              const to = `${baseTo}/${fromPath}`;
+              logger.info('Copy path', { from, to });
+              fs.copySync(from, to);
+            }
+          } catch (error) {
+            logger.error(error);
+          }
+        }
+        {
+          try {
+            let output = shellExec('git status', { silent: true, stdout: true });
+            console.log('output:', output);
+            output = output
+              .split(`to include in what will be committed)`)[1]
+              .split(`no changes added to commit`)[0]
+              .split(`\n`)
+              .map((l) => l.trim())
+              .filter((l) => l);
+
+            for (const fromPath of output) {
+              const from = `${baseFrom}/${fromPath}`;
+              const to = `${baseTo}/${fromPath}`;
+              logger.info('Copy path', { from, to });
+              fs.copySync(from, to);
+            }
+          } catch (error) {
+            logger.error(error);
+          }
+        }
+      }
+      break;
+    case 'delete-empty-folder':
+      function cleanEmptyFoldersRecursively(folder) {
+        const isDir = fs.statSync(folder).isDirectory();
+        if (!isDir) return;
+
+        let files = fs.readdirSync(folder);
+        if (files.length > 0) {
+          files.forEach(function (file) {
+            const fullPath = dir.join(folder, file);
+            cleanEmptyFoldersRecursively(fullPath);
+          });
+
+          // re-evaluate files; after deleting subfolder
+          // we may have parent folder empty now
+          files = fs.readdirSync(folder);
+        }
+
+        if (files.length === 0) {
+          console.log('removing: ', folder);
+          fs.rmdirSync(folder);
+          return;
+        }
+      }
+      cleanEmptyFoldersRecursively('./');
+      break;
+
+    case 'text-to-image': {
+      const buffer = await getBufferPngText({
+        text: process.argv[3],
+        textColor: process.argv[4],
+        bgColor: process.argv[5],
+        size: process.argv[6],
+        debugFilename: process.argv[7],
+      });
+      fs.writeFileSync(`./text-to-image.png`, buffer);
+      break;
+    }
+    case 'fa-image':
+      const faId = process.argv[3] ? process.argv[3] : 'user';
+      const color = process.argv[4] ? process.argv[4] : '#5f5f5f';
+      const path = process.argv[5] ? process.argv[5] : './';
+
+      {
+        fs.writeFileSync(`./tmp/${faId}.svg`, svg(faId, color), 'utf8');
+        const data = fs.readFileSync(`./tmp/${faId}.svg`);
+        console.log(FileFactory.svg(data, `${faId}.svg`));
+        fs.removeSync(`${path}${faId}.svg`);
+      }
+      {
+        fs.writeFileSync(`${path}${faId}.png`, Buffer.from(faBase64Png(faId, 100, 100, color), 'base64'));
+      }
+
+      break;
+
+    case 'b64-image':
+      fs.writeFileSync('b64-image', `data:image/jpg;base64,${fs.readFileSync(process.argv[3]).toString('base64')}`);
+      break;
+
+    default:
+      break;
+  }
+} catch (error) {
+  logger.error(error, error.stack);
+}

package/bin/vs.js

@@ -1,35 +1,35 @@
-import fs from 'fs-extra';
-import { shellExec } from '../src/server/process.js';
-
-switch (process.argv[2]) {
-  case 'import':
-    {
-      const extensions = JSON.parse(fs.readFileSync(`./.vscode/extensions.json`, 'utf8'));
-      extensions.recommendations.map((extension) => {
-        if (extension) shellExec(`code --install-extension ${extension}`);
-      });
-    }
-    break;
-  case 'export':
-    {
-      shellExec(`code --list-extensions > vs-extensions.txt`);
-      fs.writeFileSync(
-        `./.vscode/extensions.json`,
-        JSON.stringify(
-          {
-            recommendations: fs
-              .readFileSync(`./vs-extensions.txt`, 'utf8')
-              .split(`\n`)
-              .filter((ext) => ext.trim()),
-          },
-          null,
-          4,
-        ),
-        'utf8',
-      );
-      fs.removeSync(`./vs-extensions.txt`);
-    }
-    break;
-  default:
-    break;
-}
+import fs from 'fs-extra';
+import { shellExec } from '../src/server/process.js';
+
+switch (process.argv[2]) {
+  case 'import':
+    {
+      const extensions = JSON.parse(fs.readFileSync(`./.vscode/extensions.json`, 'utf8'));
+      extensions.recommendations.map((extension) => {
+        if (extension) shellExec(`code --install-extension ${extension}`);
+      });
+    }
+    break;
+  case 'export':
+    {
+      shellExec(`code --list-extensions > vs-extensions.txt`);
+      fs.writeFileSync(
+        `./.vscode/extensions.json`,
+        JSON.stringify(
+          {
+            recommendations: fs
+              .readFileSync(`./vs-extensions.txt`, 'utf8')
+              .split(`\n`)
+              .filter((ext) => ext.trim()),
+          },
+          null,
+          4,
+        ),
+        'utf8',
+      );
+      fs.removeSync(`./vs-extensions.txt`);
+    }
+    break;
+  default:
+    break;
+}