underpost 2.8.86 → 2.8.88

package/.env.development

@@ -2,6 +2,43 @@ DEPLOY_ID=dd-default
 NODE_ENV=development
 PORT=4000
 JWT_SECRET=test
-EXPIRE=168
+REFRESH_EXPIRE_MINUTES=5
+ACCESS_EXPIRE_MINUTES=1440
 NODE_OPTIONS=--max-old-space-size=8192
-BASE_API=api
+TIME_ZONE=changethis
+GITHUB_TOKEN=changethis
+GITHUB_USERNAME=changethis
+GITHUB_BACKUP_REPO=changethis
+GITHUB_DNS_REPO=changethis
+DEFAULT_DEPLOY_ID=dd-default
+DEFAULT_DEPLOY_HOST=default.net
+DEFAULT_DEPLOY_PATH=/
+MARIADB_HOST=changethis
+MARIADB_USER=changethis
+MARIADB_PASSWORD=changethis
+DD_LAMPP_TEST_DB_0=changethis
+WIFI=changethis
+ROUTER=changethis
+CLOUDINARY_CLOUD_NAME=changethis
+CLOUDINARY_API_KEY=changethis
+CLOUDINARY_API_SECRET=changethis
+DB_PG_MAAS_NAME=changethis
+DB_PG_MAAS_PASS=changethis
+DB_PG_MAAS_USER=changethis
+DB_PG_MAAS_HOST=127.0.0.1
+DB_PG_MAAS_PORT=5432
+MAAS_ADMIN_USERNAME=changethis
+MAAS_API_KEY=changethis
+MAAS_ADMIN_EMAIL=admin@default.net
+MAAS_ADMIN_PASS=changethis
+TFTP_ROOT=changethis
+NETMASK=255.255.255.0
+RPI4_INTERFACE_NAME=changethis
+RPI4_IP=192.168.1.192
+MAAS_DNS=8.8.8.8
+MAAS_NTP_SERVER=changethis
+NFS_EXPORT_PATH=changethis
+RPI4_MAC_ADDRESS=changethis
+NVIDIA_API_KEY=changethis
+DEFAULT_ADMIN_EMAIL=admin@default.net
+DEFAULT_ADMIN_PASSWORD=changethis

package/.env.production

@@ -2,6 +2,46 @@ DEPLOY_ID=dd-default
 NODE_ENV=production
 PORT=3000
 JWT_SECRET=test
-EXPIRE=168
+REFRESH_EXPIRE_MINUTES=5
+ACCESS_EXPIRE_MINUTES=1440
 NODE_OPTIONS=--max-old-space-size=8192
-BASE_API=api
+TIME_ZONE=changethis
+GITHUB_TOKEN=changethis
+GITHUB_USERNAME=changethis
+GITHUB_BACKUP_REPO=changethis
+GITHUB_DNS_REPO=changethis
+DEFAULT_DEPLOY_ID=dd-default
+DEFAULT_DEPLOY_HOST=default.net
+DEFAULT_DEPLOY_PATH=/
+MARIADB_HOST=changethis
+MARIADB_USER=changethis
+MARIADB_PASSWORD=changethis
+DD_LAMPP_TEST_DB_0=changethis
+WIFI=changethis
+ROUTER=changethis
+CLOUDINARY_CLOUD_NAME=changethis
+CLOUDINARY_API_KEY=changethis
+CLOUDINARY_API_SECRET=changethis
+DB_PG_MAAS_NAME=changethis
+DB_PG_MAAS_PASS=changethis
+DB_PG_MAAS_USER=changethis
+DB_PG_MAAS_HOST=127.0.0.1
+DB_PG_MAAS_PORT=5432
+MAAS_ADMIN_USERNAME=changethis
+MAAS_API_KEY=changethis
+MAAS_ADMIN_EMAIL=admin@default.net
+MAAS_ADMIN_PASS=changethis
+TFTP_ROOT=changethis
+NETMASK=255.255.255.0
+RPI4_INTERFACE_NAME=changethis
+RPI4_IP=192.168.1.192
+MAAS_DNS=8.8.8.8
+MAAS_NTP_SERVER=changethis
+NFS_EXPORT_PATH=changethis
+RPI4_MAC_ADDRESS=changethis
+NVIDIA_API_KEY=changethis
+DEFAULT_ADMIN_EMAIL=admin@default.net
+DEFAULT_ADMIN_PASSWORD=changethis
+DEFAULT_SSH_USER=changethis
+DEFAULT_SSH_HOST=changethis
+DEFAULT_SSH_KEY_PATH=changethis

package/.env.test

@@ -2,6 +2,43 @@ DEPLOY_ID=dd-default
 NODE_ENV=test
 PORT=5000
 JWT_SECRET=test
-EXPIRE=168
+REFRESH_EXPIRE_MINUTES=5
+ACCESS_EXPIRE_MINUTES=1440
 NODE_OPTIONS=--max-old-space-size=8192
-BASE_API=api
+TIME_ZONE=changethis
+GITHUB_TOKEN=changethis
+GITHUB_USERNAME=changethis
+GITHUB_BACKUP_REPO=changethis
+GITHUB_DNS_REPO=changethis
+DEFAULT_DEPLOY_ID=dd-default
+DEFAULT_DEPLOY_HOST=default.net
+DEFAULT_DEPLOY_PATH=/
+MARIADB_HOST=changethis
+MARIADB_USER=changethis
+MARIADB_PASSWORD=changethis
+DD_LAMPP_TEST_DB_0=changethis
+WIFI=changethis
+ROUTER=changethis
+CLOUDINARY_CLOUD_NAME=changethis
+CLOUDINARY_API_KEY=changethis
+CLOUDINARY_API_SECRET=changethis
+DB_PG_MAAS_NAME=changethis
+DB_PG_MAAS_PASS=changethis
+DB_PG_MAAS_USER=changethis
+DB_PG_MAAS_HOST=127.0.0.1
+DB_PG_MAAS_PORT=5432
+MAAS_ADMIN_USERNAME=changethis
+MAAS_API_KEY=changethis
+MAAS_ADMIN_EMAIL=admin@default.net
+MAAS_ADMIN_PASS=changethis
+TFTP_ROOT=changethis
+NETMASK=255.255.255.0
+RPI4_INTERFACE_NAME=changethis
+RPI4_IP=192.168.1.192
+MAAS_DNS=8.8.8.8
+MAAS_NTP_SERVER=changethis
+NFS_EXPORT_PATH=changethis
+RPI4_MAC_ADDRESS=changethis
+NVIDIA_API_KEY=changethis
+DEFAULT_ADMIN_EMAIL=admin@default.net
+DEFAULT_ADMIN_PASSWORD=changethis

package/.github/workflows/ghpkg.ci.yml

@@ -14,7 +14,7 @@ jobs:
     name: Update github repo package Jobs
     runs-on: ubuntu-latest
     container:
-      image: rockylinux/rockylinux:9
+      image: quay.io/rockylinux/rockylinux:9
     permissions:
       contents: write
       packages: write

package/.github/workflows/npmpkg.ci.yml

@@ -14,7 +14,7 @@ jobs:
     name: Update npm repo package Jobs
     runs-on: ubuntu-latest
     container:
-      image: rockylinux/rockylinux:9
+      image: quay.io/rockylinux/rockylinux:9
     permissions:
       contents: write
       packages: write

package/.github/workflows/pwa-microservices-template-page.cd.yml

@@ -4,7 +4,7 @@ name: CD | Gihub page | PWA Microservices Template
 on:
   # Runs on pushes targeting the default branch
   push:
-    branches: ['main']
+    branches: ["main"]
 
   # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:
@@ -18,7 +18,7 @@ permissions:
 # Allow only one concurrent deployment, skipping runs queued between the run in-progress and latest queued.
 # However, do NOT cancel in-progress runs as we want to allow these production deployments to complete.
 concurrency:
-  group: 'pages'
+  group: "pages"
   cancel-in-progress: false
 
 jobs:
@@ -30,7 +30,7 @@ jobs:
       url: ${{ steps.deployment.outputs.page_url }}
     runs-on: ubuntu-latest
     container:
-      image: rockylinux/rockylinux:9
+      image: quay.io/rockylinux/rockylinux:9
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -53,7 +53,8 @@ jobs:
         run: |
           npm install -g underpost
           npm install
-          node bin/deploy update-default-conf ghpkg
+          node bin/deploy update-default-conf dd-github-pages
+          underpost env dd-github-pages production
           env-cmd -f .env.production node bin/deploy build-full-client dd-github-pages underpostnet.github.io /pwa-microservices-template-ghpkg
       # git lfs install
       # git lfs track
@@ -65,7 +66,7 @@ jobs:
         uses: actions/upload-pages-artifact@v3
         with:
           # Upload entire repository
-          path: './public/underpostnet.github.io/pwa-microservices-template-ghpkg/'
+          path: "./public/underpostnet.github.io/pwa-microservices-template-ghpkg/"
       - name: Deploy to GitHub Pages
         id: deployment
         uses: actions/deploy-pages@v4

package/.github/workflows/pwa-microservices-template-test.ci.yml

@@ -7,7 +7,7 @@ jobs:
     name: Template Test
     runs-on: ubuntu-latest
     container:
-      image: rockylinux/rockylinux:9
+      image: quay.io/rockylinux/rockylinux:9
       options: --entrypoint /bin/bash
     steps:
       - name: Clone repository

package/.github/workflows/release.cd.yml

@@ -2,7 +2,7 @@ name: CD | Release deployment | remote ssh
 
 on:
   workflow_run:
-    workflows: ['CI | Publish npm package']
+    workflows: ["CI | Publish npm package"]
     types:
       - completed
 
@@ -30,8 +30,8 @@ jobs:
             echo "Starting remote release deploy"
             cd /home/dd/engine
             npm install -g underpost
-            underpost config set GITHUB_TOKEN ${{ secrets.GITHUB_TOKEN }}
+            underpost run secret
             node bin run --dev pull
             underpost run secret
             underpost run underpost-config
-            underpost run release-deploy
+            underpost run ssh-deploy engine-test

package/README.md

@@ -26,10 +26,47 @@
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 <!-- badges -->
 
 
-[![Node.js CI](https://github.com/underpostnet/engine/actions/workflows/docker-image.ci.yml/badge.svg?branch=master)](https://github.com/underpostnet/engine/actions/workflows/docker-image.yml) [![Test](https://github.com/underpostnet/engine/actions/workflows/coverall.ci.yml/badge.svg?branch=master)](https://github.com/underpostnet/engine/actions/workflows/coverall.yml) [![Downloads](https://img.shields.io/npm/dm/underpost.svg)](https://www.npmjs.com/package/underpost) [![Socket Badge](https://socket.dev/api/badge/npm/package/underpost/2.8.86)](https://socket.dev/npm/package/underpost/overview/2.8.86) [![Coverage Status](https://coveralls.io/repos/github/underpostnet/engine/badge.svg?branch=master)](https://coveralls.io/github/underpostnet/engine?branch=master) [![Version](https://img.shields.io/npm/v/underpost.svg)](https://www.npmjs.org/package/underpost) [![License](https://img.shields.io/npm/l/underpost.svg)](https://www.npmjs.com/package/underpost)
+[![Node.js CI](https://github.com/underpostnet/engine/actions/workflows/docker-image.ci.yml/badge.svg?branch=master)](https://github.com/underpostnet/engine/actions/workflows/docker-image.yml) [![Test](https://github.com/underpostnet/engine/actions/workflows/coverall.ci.yml/badge.svg?branch=master)](https://github.com/underpostnet/engine/actions/workflows/coverall.yml) [![Downloads](https://img.shields.io/npm/dm/underpost.svg)](https://www.npmjs.com/package/underpost) [![Socket Badge](https://socket.dev/api/badge/npm/package/underpost/2.8.88)](https://socket.dev/npm/package/underpost/overview/2.8.88) [![Coverage Status](https://coveralls.io/repos/github/underpostnet/engine/badge.svg?branch=master)](https://coveralls.io/github/underpostnet/engine?branch=master) [![Version](https://img.shields.io/npm/v/underpost.svg)](https://www.npmjs.org/package/underpost) [![License](https://img.shields.io/npm/l/underpost.svg)](https://www.npmjs.com/package/underpost)
 
 
 <!-- end-badges -->
@@ -44,6 +81,43 @@
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 </div>
 
 <div align="center">
@@ -88,7 +162,7 @@ Run dev client server
 npm run dev
 ```
 <!-- -->
-## underpost ci/cd cli v2.8.86
+## underpost ci/cd cli v2.8.88
 
 ### Usage: `underpost [options] [command]`
   ```

package/bin/build.js

@@ -156,6 +156,7 @@ const { DefaultConf } = await import(`../conf.${confName}.js`);
   switch (confName) {
     case 'dd-cyberia':
       fs.copyFileSync(`./bin/cyberia.js`, `${basePath}/bin/cyberia.js`);
+      fs.copyFileSync(`./bin/cyberia.js`, `${basePath}/bin/cyberia0.js`);
       break;
 
     default:
@@ -190,6 +191,10 @@ const { DefaultConf } = await import(`../conf.${confName}.js`);
   fs.copyFileSync(`./.github/workflows/${repoName}.ci.yml`, `${basePath}/.github/workflows/${repoName}.ci.yml`);
   fs.copyFileSync(`./.github/workflows/${repoName}.cd.yml`, `${basePath}/.github/workflows/${repoName}.cd.yml`);
 
+  fs.copyFileSync(`./conf.${confName}.js`, `${basePath}/conf.js`);
+  fs.copyFileSync(`./manifests/deployment/${confName}-development/proxy.yaml`, `${basePath}/proxy.yaml`);
+  fs.copyFileSync(`./manifests/deployment/${confName}-development/deployment.yaml`, `${basePath}/deployment.yaml`);
+
   if (fs.existsSync(`./src/ws/${confName.split('-')[1]}`)) {
     fs.copySync(`./src/ws/${confName.split('-')[1]}`, `${basePath}/src/ws/${confName.split('-')[1]}`);
   }

package/bin/deploy.js

@@ -28,6 +28,7 @@ import { DefaultConf } from '../conf.js';
 import colors from 'colors';
 import { program } from '../src/cli/index.js';
 import { getLocalIPv4Address, ip } from '../src/server/dns.js';
+import { timer } from '../src/client/components/core/CommonJs.js';
 
 colors.enable();
 
@@ -39,19 +40,6 @@ const [exe, dir, operator] = process.argv;
 
 try {
   switch (operator) {
-    case 'save':
-      {
-        let deployId = process.argv[3] ?? 'dd-default';
-        if (!deployId.startsWith('dd-')) deployId = 'dd-default';
-        const folder = `./engine-private/conf/${deployId}`;
-        if (fs.existsSync(folder)) fs.removeSync(folder);
-        await Config.build({ folder });
-        fs.writeFileSync(`${folder}/.env.production`, fs.readFileSync('./.env.production', 'utf8'), 'utf8');
-        fs.writeFileSync(`${folder}/.env.development`, fs.readFileSync('./.env.development', 'utf8'), 'utf8');
-        fs.writeFileSync(`${folder}/.env.test`, fs.readFileSync('./.env.test', 'utf8'), 'utf8');
-        fs.writeFileSync(`${folder}/package.json`, fs.readFileSync('./package.json', 'utf8'), 'utf8');
-      }
-      break;
     case 'add-nodejs-app-client-conf':
       {
         const toOptions = {
@@ -271,23 +259,20 @@ try {
       for (const deployIdObj of dataDeploy) {
         const { deployId, replicaHost } = deployIdObj;
         if (replicaHost && !singleReplicaHosts.includes(replicaHost)) singleReplicaHosts.push(replicaHost);
-        const proxyInstance = deployId.match('proxy') || deployId.match('cron');
         const baseConfPath = fs.existsSync(`./engine-private/replica/${deployId}`)
           ? `./engine-private/replica`
           : `./engine-private/conf`;
         for (const envInstanceObj of dataEnv) {
           const envPath = `${baseConfPath}/${deployId}/.env.${envInstanceObj.env}`;
           const envObj = dotenv.parse(fs.readFileSync(envPath, 'utf8'));
-          envObj.PORT = proxyInstance
-            ? envInstanceObj.port
-            : envInstanceObj.port + port - singleReplicaHosts.length - (replicaHost ? 1 : 0);
+          envObj.PORT = envInstanceObj.port + port - singleReplicaHosts.length - (replicaHost ? 1 : 0);
 
           writeEnv(envPath, envObj);
         }
         const serverConf = loadReplicas(
           JSON.parse(fs.readFileSync(`${baseConfPath}/${deployId}/conf.server.json`, 'utf8')),
         );
-        if (!proxyInstance) for (const host of Object.keys(serverConf)) port += Object.keys(serverConf[host]).length;
+        for (const host of Object.keys(serverConf)) port += Object.keys(serverConf[host]).length;
       }
       break;
 
@@ -383,10 +368,30 @@ try {
     }
 
     case 'version-build': {
+      shellCd(`/home/dd/engine`);
       shellExec(`node bin/deploy clean-core-repo`);
+      shellExec(`node bin pull . ${process.env.GITHUB_USERNAME}/engine`);
+      shellExec(`node bin run kill 4001`);
+      shellExec(`node bin run kill 4002`);
+      shellExec(`node bin run kill 4003`);
+      shellExec(`npm run update-template`);
+      shellExec(`cd ../pwa-microservices-template && npm install`);
+      shellExec(`cd ../pwa-microservices-template && npm run build && timeout 5s npm run dev`, {
+        async: true,
+      });
+      await timer(5500);
+      const templateRunnerResult = fs.readFileSync(`../pwa-microservices-template/logs/start.js/all.log`, 'utf8');
+      logger.info('Test template runner result');
+      console.log(templateRunnerResult);
+      if (!templateRunnerResult || templateRunnerResult.toLowerCase().match('error')) {
+        logger.error('Test template runner result failed');
+        break;
+      }
       shellCd(`/home/dd/engine`);
+      shellExec(`node bin/deploy clean-core-repo`);
       const originPackageJson = JSON.parse(fs.readFileSync(`package.json`, 'utf8'));
       const newVersion = process.argv[3] ?? originPackageJson.version;
+      const node = process.argv[4] ?? 'kind-control-plane';
       const { version } = originPackageJson;
       originPackageJson.version = newVersion;
       fs.writeFileSync(`package.json`, JSON.stringify(originPackageJson, null, 4), 'utf8');
@@ -444,8 +449,27 @@ try {
       shellExec(`node bin/deploy update-dependencies`);
       shellExec(`auto-changelog`);
       shellExec(`node bin/build dd`);
-      shellExec(`node bin deploy --kubeadm --build-manifest --sync --info-router --replicas 1 dd`);
-      shellExec(`node bin deploy --kubeadm --build-manifest --sync --info-router --replicas 1 dd production`);
+      shellExec(
+        `node bin deploy --kubeadm --build-manifest --sync --info-router --replicas 1 --node ${node} dd production`,
+      );
+      shellExec(
+        `node bin deploy --kubeadm --build-manifest --sync --info-router --replicas 1 --node ${node} dd development `,
+      );
+      for (const deployId of fs.readFileSync(`./engine-private/deploy/dd.router`, 'utf8').split(`,`)) {
+        fs.copySync(
+          `./engine-private/conf/${deployId}/build/development/deployment.yaml`,
+          `./manifests/deployment/${deployId}-development/deployment.yaml`,
+        );
+        fs.copySync(
+          `./engine-private/conf/${deployId}/build/development/proxy.yaml`,
+          `./manifests/deployment/${deployId}-development/proxy.yaml`,
+        );
+      }
+      shellExec(`sudo rm -rf ./engine-private/conf/dd-default`);
+      shellExec(`node bin new --deploy-id dd-default`);
+      console.log(fs.existsSync(`./engine-private/conf/dd-default`));
+      shellExec(`sudo rm -rf ./engine-private/conf/dd-default`);
+      shellExec(`node bin/deploy build-env`);
       break;
     }
 
@@ -457,8 +481,8 @@ try {
       shellExec(`git add . && cd ./engine-private && git add .`);
       shellExec(`node bin cmt . ci package-pwa-microservices-template`);
       shellExec(`node bin cmt ./engine-private ci package-pwa-microservices-template`);
-      shellExec(`node bin push . underpostnet/engine`);
-      shellExec(`cd ./engine-private && node ../bin push . underpostnet/engine-private`);
+      shellExec(`node bin push . ${process.env.GITHUB_USERNAME}/engine`);
+      shellExec(`cd ./engine-private && node ../bin push . ${process.env.GITHUB_USERNAME}/engine-private`);
       break;
     }
 
@@ -512,19 +536,49 @@ ${shellExec(`git log | grep Author: | sort -u`, { stdout: true }).split(`\n`).jo
 
       break;
     }
+    case 'build-env': {
+      for (let envPath of ['.env.development', '.env.production', '.env.test']) {
+        const privateEnvPath = `./engine-private/conf/dd-cron/${envPath}`;
+        const privateEnv = dotenv.parse(fs.readFileSync(privateEnvPath, 'utf8'));
+        let env = {};
+        for (const key of Object.keys(privateEnv)) {
+          const originEnv = dotenv.parse(fs.readFileSync(`./${envPath}`, 'utf8'));
+          if (key in originEnv) {
+            env[key] = originEnv[key];
+            continue;
+          }
+          env[key] =
+            `${key}`.toUpperCase().match('API') ||
+            `${key}`.toUpperCase().match('KEY') ||
+            `${key}`.toUpperCase().match('SECRET') ||
+            `${key}`.toUpperCase().match('TOKEN') ||
+            `${key}`.toUpperCase().match('PASSWORD') ||
+            `${key}`.toUpperCase().match('MAC')
+              ? 'changethis'
+              : isNaN(parseFloat(privateEnv[key]))
+              ? `${privateEnv[key]}`.match(`@`)
+                ? 'admin@default.net'
+                : 'changethis'
+              : privateEnv[key];
+        }
+        writeEnv(envPath, env);
+      }
+      break;
+    }
 
     case 'update-default-conf': {
       const defaultServer = DefaultConf.server['default.net']['/'];
       let confName = process.argv[3];
-      if (confName === 'ghpkg') {
-        confName = undefined;
-        const host = 'underpostnet.github.io';
+      let defaultConf = false;
+      if (confName === 'dd-github-pages') {
+        const host = `${process.env.GITHUB_USERNAME ?? 'underpostnet'}.github.io`;
         const path = '/pwa-microservices-template-ghpkg';
         DefaultConf.server = {
           [host]: { [path]: defaultServer },
         };
         DefaultConf.server[host][path].apiBaseProxyPath = '/';
         DefaultConf.server[host][path].apiBaseHost = 'www.nexodev.org';
+        defaultConf = true;
       } else if (confName === 'template') {
         const host = 'default.net';
         const path = '/';
@@ -534,7 +588,7 @@ ${shellExec(`git log | grep Author: | sort -u`, { stdout: true }).split(`\n`).jo
         };
         // mongodb-0.mongodb-service
         DefaultConf.server[host][path].db.host = 'mongodb://mongodb-service:27017';
-        confName = '';
+        defaultConf = true;
       } else if (confName && fs.existsSync(`./engine-private/conf/${confName}`)) {
         DefaultConf.client = JSON.parse(fs.readFileSync(`./engine-private/conf/${confName}/conf.client.json`, 'utf8'));
         DefaultConf.server = JSON.parse(fs.readFileSync(`./engine-private/conf/${confName}/conf.server.json`, 'utf8'));
@@ -558,10 +612,22 @@ ${shellExec(`git log | grep Author: | sort -u`, { stdout: true }).split(`\n`).jo
       const sepRender = '/**/';
       const confRawPaths = fs.readFileSync('./conf.js', 'utf8').split(sepRender);
       confRawPaths[1] = `${JSON.stringify(DefaultConf)};`;
-      const targetConfPath = `./conf${confName ? `.${confName}` : ''}.js`;
+      const targetConfPath = `./conf${defaultConf ? '' : `.${confName}`}.js`;
       fs.writeFileSync(targetConfPath, confRawPaths.join(sepRender), 'utf8');
       shellExec(`prettier --write ${targetConfPath}`);
 
+      switch (confName) {
+        case 'dd-github-pages':
+          {
+            if (fs.exists(`./engine-private/conf/${confName}`)) fs.removeSync(`./engine-private/conf/${confName}`);
+            shellExec(`node bin new --deploy-id ${confName}`);
+          }
+          break;
+
+        default:
+          break;
+      }
+
       break;
     }
 

package/bin/file.js

@@ -56,10 +56,13 @@ try {
       console.log('copy paths', result);
 
       if (type === 'update-template') {
-        if (!fs.existsSync(toPath)) shellExec(`cd .. && underpost clone underpostnet/pwa-microservices-template`);
+        if (!fs.existsSync(toPath))
+          shellExec(`cd .. && underpost clone ${process.env.GITHUB_USERNAME}/pwa-microservices-template`);
         else {
           shellExec(`cd ${toPath} && git reset && git checkout . && git clean -f -d`);
-          shellExec(`underpost pull ${toPath} underpostnet/pwa-microservices-template`);
+          shellExec(`underpost pull ${toPath} ${process.env.GITHUB_USERNAME}/pwa-microservices-template`);
+          shellExec(`sudo rm -rf ${toPath}/engine-private`);
+          shellExec(`sudo rm -rf ${toPath}/logs`);
         }
       } else {
         fs.removeSync(toPath);
@@ -94,6 +97,7 @@ try {
           './manifests/deployment/dd-template-development',
           'bin/web3.js',
           'bin/cyberia.js',
+          'bin/cyberia0.js',
         ]) {
           if (fs.existsSync(deletePath)) fs.removeSync('../pwa-microservices-template/' + deletePath);
         }
@@ -125,8 +129,8 @@ try {
         templatePackageJson.scripts = originPackageJson.scripts;
         templatePackageJson.name = name;
         templatePackageJson.description = description;
-        templatePackageJson.scripts.dev = dev;
-        templatePackageJson.scripts.build = build;
+        // templatePackageJson.scripts.dev = dev;
+        // templatePackageJson.scripts.build = build;
         templatePackageJson.keywords = uniqueArray(
           ['pwa', 'microservices', 'template', 'builder'].concat(templatePackageJson.keywords),
         );

package/bin/util.js

@@ -1,14 +1,10 @@
 import fs from 'fs-extra';
 import si from 'systeminformation';
 import * as dir from 'path';
-import { svg } from 'font-awesome-assets';
 
 import { loggerFactory } from '../src/server/logger.js';
-import { pbcopy, shellExec } from '../src/server/process.js';
+import { pbcopy } from '../src/server/process.js';
 import { buildKindPorts } from '../src/server/conf.js';
-import { FileFactory } from '../src/api/file/file.service.js';
-import { faBase64Png, getBufferPngText } from '../src/server/client-icons.js';
-import keyword_extractor from 'keyword-extractor';
 
 const logger = loggerFactory(import.meta);
 
@@ -73,57 +69,6 @@ try {
       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;
-
-    case 'get-keys': {
-      const sentence = fs.existsSync('./_')
-        ? fs.readFileSync('./_', 'utf8')
-        : process.argv[3]
-        ? process.argv[3]
-        : 'President Obama woke up Monday facing a Congressional defeat that many in both parties believed could hobble his presidency.';
-
-      //  Extract the keywords
-      const extraction_result = keyword_extractor.extract(sentence, {
-        language: 'english',
-        remove_digits: true,
-        // return_changed_case: true,
-        // remove_duplicates: false,
-      });
-
-      console.log(extraction_result.join(', '));
-      break;
-    }
-
     case 'build-ports': {
       pbcopy(buildKindPorts(process.argv[3], process.argv[4]));
     }