cyberia 2.99.8 → 3.0.2

package/bin/deploy.js

@@ -374,7 +374,9 @@ try {
       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 install && echo "\nENABLE_FILE_LOGS=true" >> .env.development`,
+      );
       shellExec(`cd ../pwa-microservices-template && npm run build && timeout 5s npm run dev`, {
         async: true,
       });
@@ -509,33 +511,23 @@ ${shellExec(`git log | grep Author: | sort -u`, { stdout: true }).split(`\n`).jo
       // https://besu.hyperledger.org/
       // https://github.com/hyperledger/besu/archive/refs/tags/24.9.1.tar.gz
 
-      switch (process.platform) {
-        case 'linux':
-          {
-            shellCd(`..`);
-
-            // Download the Linux binary
-            shellExec(`wget https://github.com/hyperledger/besu/releases/download/24.9.1/besu-24.9.1.tar.gz`);
-
-            // Unzip the file:
-            shellExec(`tar -xvzf besu-24.9.1.tar.gz`);
+      shellCd(`..`);
 
-            shellCd(`besu-24.9.1`);
+      // Download the Linux binary
+      shellExec(`wget https://github.com/hyperledger/besu/releases/download/24.9.1/besu-24.9.1.tar.gz`);
 
-            shellExec(`bin/besu --help`);
+      // Unzip the file:
+      shellExec(`tar -xvzf besu-24.9.1.tar.gz`);
 
-            // Set env path
-            // export PATH=$PATH:/home/dd/besu-24.9.1/bin
+      shellCd(`besu-24.9.1`);
 
-            // Open src
-            // shellExec(`sudo code /home/dd/besu-24.9.1 --user-data-dir="/root/.vscode-root" --no-sandbox`);
-          }
+      shellExec(`bin/besu --help`);
 
-          break;
+      // Set env path
+      // export PATH=$PATH:/home/dd/besu-24.9.1/bin
 
-        default:
-          break;
-      }
+      // Open src
+      // shellExec(`sudo code /home/dd/besu-24.9.1 --user-data-dir="/root/.vscode-root" --no-sandbox`);
 
       break;
     }
@@ -568,42 +560,6 @@ ${shellExec(`git log | grep Author: | sort -u`, { stdout: true }).split(`\n`).jo
       break;
     }
 
-    case 'postgresql': {
-      if (process.argv.includes('install')) {
-        shellExec(`sudo dnf install -y postgresql-server postgresql`);
-        shellExec(`sudo postgresql-setup --initdb`);
-        shellExec(`chown postgres /var/lib/pgsql/data`);
-        shellExec(`sudo systemctl enable postgresql.service`);
-        shellExec(`sudo systemctl start postgresql.service`);
-      } else {
-        shellExec(`sudo systemctl enable postgresql.service`);
-        shellExec(`sudo systemctl restart postgresql.service`);
-      }
-
-      shellExec(`sudo systemctl status postgresql.service`);
-
-      // sudo systemctl stop postgresql
-      // sudo systemctl disable postgresql
-
-      // psql login
-      // psql -U <user> -h 127.0.0.1 -W <db-name>
-
-      // gedit /var/lib/pgsql/data/pg_hba.conf
-      // host    <db-name>    	<db-user>        <db-host>               md5
-      // local   all             postgres                                trust
-      // # "local" is for Unix domain socket connections only
-      // local   all             all                                     md5
-      // # IPv4 local connections:
-      // host    all             all             127.0.0.1/32            md5
-      // # IPv6 local connections:
-      // host    all             all             ::1/128                 md5
-
-      // gedit /var/lib/pgsql/data/postgresql.conf
-      // listen_addresses = '*'
-
-      break;
-    }
-
     case 'postgresql-17': {
       if (process.argv.includes('install')) {
         shellExec(`sudo dnf module reset postgresql -y`);
@@ -635,46 +591,6 @@ ${shellExec(`git log | grep Author: | sort -u`, { stdout: true }).split(`\n`).jo
       break;
     }
 
-    case 'postgresql-14': {
-      if (process.argv.includes('install')) {
-        shellExec(`sudo dnf module reset postgresql -y`);
-        shellExec(`sudo dnf -qy module disable postgresql`);
-
-        shellExec(`sudo systemctl stop postgresql-14`);
-        shellExec(`sudo systemctl disable postgresql-14`);
-
-        shellExec(`sudo dnf remove -y postgresql14 postgresql14-server postgresql14-contrib`);
-        shellExec(`sudo rm -rf /var/lib/pgsql`);
-
-        shellExec(`sudo dnf install postgresql14 postgresql14-server postgresql14-contrib -y`);
-      }
-      if (process.argv.includes('uninstall')) {
-        shellExec(`sudo systemctl stop postgresql-14`);
-        shellExec(`sudo systemctl disable postgresql-14`);
-        shellExec(`sudo dnf remove -y postgresql14 postgresql14-server postgresql14-contrib`);
-        shellExec(`sudo rm -rf /var/lib/pgsql /var/log/pgsql /etc/postgresql`);
-      } else {
-        shellExec(`sudo /usr/pgsql-14/bin/postgresql-14-setup initdb`);
-        shellExec(`sudo systemctl start postgresql-14`);
-        shellExec(`sudo systemctl enable postgresql-14`);
-        shellExec(`sudo systemctl status postgresql-14`);
-        // sudo dnf install postgresql14-contrib
-      }
-
-      break;
-    }
-
-    case 'pg-stop': {
-      shellExec(`sudo systemctl stop postgresql-14`);
-      shellExec(`sudo systemctl disable postgresql-14`);
-      break;
-    }
-    case 'pg-start': {
-      shellExec(`sudo systemctl enable postgresql-14`);
-      shellExec(`sudo systemctl restart postgresql-14`);
-      break;
-    }
-
     case 'pg-list-db': {
       shellExec(`sudo -i -u postgres psql -c "\\l"`);
       break;
@@ -696,36 +612,6 @@ ${shellExec(`git log | grep Author: | sort -u`, { stdout: true }).split(`\n`).jo
       break;
     }
 
-    case 'mount': {
-      const mounts = shellExec(`mount`).split(`\n`);
-      console.table(
-        mounts
-          .filter((l) => l.trim())
-          .map(
-            (o) => (
-              (o = o.split(' ')),
-              {
-                path: o[2],
-                type: o[4],
-                permissions: o[5],
-              }
-            ),
-          ),
-      );
-      break;
-    }
-
-    case 'create-ports': {
-      const cmd = [];
-      const commissioningDeviceIp = Underpost.dns.getLocalIPv4Address();
-      for (const port of ['5240']) {
-        const name = 'maas';
-        cmd.push(`${name}:${port}-${port}:${commissioningDeviceIp}`);
-      }
-      pbcopy(`node engine-private/r create-port ${cmd}`);
-      break;
-    }
-
     case 'fastapi-models': {
       shellExec(`chmod +x ../full-stack-fastapi-template/backend/initial_data.sh`);
       shellExec(`../full-stack-fastapi-template/backend/initial_data.sh`);
@@ -987,22 +873,6 @@ nvidia/gpu-operator \
       break;
     }
 
-    case 'update-static-guide': {
-      fs.writeFileSync(
-        `src/client/public/nexodev/docs/references/Static Site Generator Quick Reference.md`,
-        fs.readFileSync(`examples/static-page/QUICK-REFERENCE.md`, 'utf8'),
-      );
-      fs.writeFileSync(
-        `src/client/public/nexodev/docs/references/Static Site Generator Examples.md`,
-        fs.readFileSync(`examples/static-page/README.md`, 'utf8'),
-      );
-      fs.writeFileSync(
-        `src/client/public/nexodev/docs/references/Static Generator Guide.md`,
-        fs.readFileSync(`examples/static-page/STATIC-GENERATOR-GUIDE.md`, 'utf8'),
-      );
-      break;
-    }
-
     case 'udpate-version-files': {
       const oldNpmVersion = process.argv[3];
       const oldNodeVersion = process.argv[4];
@@ -1018,13 +888,6 @@ nvidia/gpu-operator \
           .replaceAll(oldNodeVersion, nodeVersion)
           .replaceAll(oldNpmVersion, npmVersion),
       );
-      fs.writeFileSync(
-        `manifests/lxd/underpost-setup.sh`,
-        fs
-          .readFileSync(`manifests/lxd/underpost-setup.sh`, 'utf8')
-          .replaceAll(oldNodeVersion, nodeVersion)
-          .replaceAll(oldNpmVersion, npmVersion),
-      );
       fs.writeFileSync(
         `src/client/public/nexodev/docs/references/Getting started.md`,
         fs

package/bin/file.js

@@ -22,26 +22,22 @@ logger.info('argv', process.argv);
 let [exe, dir, type] = process.argv;
 let rawPath = process.argv[3].replaceAll(`'`, '');
 let toPath = process.argv[4].replaceAll(`'`, '');
-
 let path = `${rawPath}`.split('/');
 path.pop();
 path = path.join('/');
-
 const file = `${rawPath}`.split('/').pop();
 const ext = file.split('.')[1];
 let name = getCapVariableName(file.split('.')[0]);
+let content = '';
 
 logger.info('File metadata', { path, file, ext, name });
 
 try {
-  let content = '';
   switch (type) {
     case 'update-template':
     case 'copy-src':
       console.log({ rawPath, toPath });
 
-      // this function returns a promise, but you can also pass a cb
-      // if you like that approach better.
       let result = await new Promise((resolve) =>
         walk(
           {
@@ -90,7 +86,7 @@ try {
         // fs.copySync(`./.github`, `../pwa-microservices-template/.github`);
         fs.copySync(`./src/client/public/default`, `../pwa-microservices-template/src/client/public/default`);
 
-        for (const checkoutPath of ['README.md', 'package-lock.json', 'package.json'])
+        for (const checkoutPath of ['README.md', 'package.json'])
           shellExec(`cd ../pwa-microservices-template && git checkout ${checkoutPath}`);
 
         for (const deletePath of [
@@ -101,6 +97,9 @@ try {
           './manifests/deployment/dd-template-development',
           './src/server/object-layer.js',
           './src/server/atlas-sprite-sheet-generator.js',
+          './src/server/shape-generator.js',
+          './src/server/semantic-layer-generator.js',
+          './test/shape-generator.test.js',
           'bin/cyberia.js',
         ]) {
           if (fs.existsSync(deletePath)) fs.removeSync('../pwa-microservices-template/' + deletePath);
@@ -114,6 +113,7 @@ try {
           `./.github/workflows/pwa-microservices-template-test.ci.yml`,
           `./.github/workflows/npmpkg.ci.yml`,
           `./.github/workflows/ghpkg.ci.yml`,
+          `./.github/workflows/gitlab.ci.yml`,
           `./.github/workflows/publish.ci.yml`,
           `./.github/workflows/release.cd.yml`,
           './src/ws/IoInterface.js',
@@ -133,6 +133,7 @@ try {
         templatePackageJson.devDependencies = originPackageJson.devDependencies;
         templatePackageJson.version = originPackageJson.version;
         templatePackageJson.scripts = originPackageJson.scripts;
+        templatePackageJson.overrides = originPackageJson.overrides;
         templatePackageJson.name = name;
         templatePackageJson.description = description;
         // templatePackageJson.scripts.dev = dev;
@@ -146,15 +147,17 @@ try {
           JSON.stringify(templatePackageJson, null, 4),
           'utf8',
         );
-
         const originPackageLockJson = JSON.parse(fs.readFileSync('./package-lock.json', 'utf8'));
+
         const templatePackageLockJson = JSON.parse(
           fs.readFileSync('../pwa-microservices-template/package-lock.json', 'utf8'),
         );
+
         const originBasePackageLock = newInstance(templatePackageLockJson.packages['']);
+        templatePackageLockJson.name = name;
         templatePackageLockJson.version = originPackageLockJson.version;
         templatePackageLockJson.packages = originPackageLockJson.packages;
-        templatePackageLockJson.packages[''].name = originBasePackageLock.name;
+        templatePackageLockJson.packages[''].name = name;
         templatePackageLockJson.packages[''].version = originPackageLockJson.version;
         templatePackageLockJson.packages[''].hasInstallScript = originBasePackageLock.hasInstallScript;
         templatePackageLockJson.packages[''].license = originBasePackageLock.license;
@@ -163,6 +166,8 @@ try {
           JSON.stringify(templatePackageLockJson, null, 4),
           'utf8',
         );
+        // Regenerate package-lock.json to match the modified package.json
+        // shellExec(`cd ../pwa-microservices-template && npm install --package-lock-only --ignore-scripts`);
         fs.writeFileSync(
           '../pwa-microservices-template/README.md',
           fs