npm - cyberia - Versions diffs - 3.0.2 → 3.1.3 - Mend

cyberia 3.0.2 → 3.1.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (182) hide show

package/{.env.production → .env.example} +20 -2
package/.github/workflows/engine-cyberia.cd.yml +41 -10
package/.github/workflows/engine-cyberia.ci.yml +53 -14
package/.github/workflows/ghpkg.ci.yml +1 -1
package/.github/workflows/gitlab.ci.yml +1 -1
package/.github/workflows/hardhat.ci.yml +82 -0
package/.github/workflows/npmpkg.ci.yml +37 -8
package/.github/workflows/publish.ci.yml +5 -5
package/.github/workflows/publish.cyberia.ci.yml +5 -5
package/.github/workflows/pwa-microservices-template-page.cd.yml +3 -3
package/.github/workflows/pwa-microservices-template-test.ci.yml +1 -1
package/.github/workflows/release.cd.yml +3 -2
package/.vscode/extensions.json +9 -8
package/.vscode/settings.json +3 -2
package/CHANGELOG.md +533 -290
package/CLI-HELP.md +79 -53
package/WHITE-PAPER.md +1540 -0
package/bin/build.js +16 -11
package/bin/cyberia.js +959 -8
package/bin/deploy.js +103 -270
package/bin/file.js +2 -1
package/bin/index.js +959 -8
package/bin/vs.js +3 -3
package/conf.js +277 -77
package/deployment.yaml +218 -4
package/hardhat/.env.example +31 -0
package/hardhat/README.md +531 -0
package/hardhat/WHITE-PAPER.md +1540 -0
package/hardhat/contracts/ObjectLayerToken.sol +391 -0
package/hardhat/deployments/.gitkeep +0 -0
package/hardhat/deployments/hardhat-ObjectLayerToken.json +11 -0
package/hardhat/hardhat.config.js +136 -0
package/hardhat/ignition/modules/ObjectLayerToken.js +21 -0
package/hardhat/networks/besu-object-layer.network.json +138 -0
package/hardhat/package-lock.json +7628 -0
package/hardhat/package.json +45 -0
package/hardhat/scripts/deployObjectLayerToken.js +98 -0
package/hardhat/test/ObjectLayerToken.js +590 -0
package/jsdoc.dd-cyberia.json +59 -0
package/jsdoc.json +20 -13
package/manifests/cronjobs/dd-cron/dd-cron-backup.yaml +1 -1
package/manifests/cronjobs/dd-cron/dd-cron-dns.yaml +1 -1
package/manifests/deployment/dd-cyberia-development/deployment.yaml +490 -0
package/manifests/deployment/dd-cyberia-development/proxy.yaml +261 -0
package/manifests/deployment/dd-cyberia-development/pv-pvc.yaml +132 -0
package/manifests/deployment/dd-default-development/deployment.yaml +2 -2
package/manifests/deployment/dd-test-development/deployment.yaml +52 -52
package/manifests/deployment/dd-test-development/proxy.yaml +4 -4
package/manifests/pv-pvc-dd.yaml +1 -1
package/package.json +60 -50
package/proxy.yaml +128 -9
package/pv-pvc.yaml +132 -0
package/scripts/k3s-node-setup.sh +1 -1
package/scripts/ports-ls.sh +2 -0
package/src/api/atlas-sprite-sheet/atlas-sprite-sheet.controller.js +3 -1
package/src/api/atlas-sprite-sheet/atlas-sprite-sheet.model.js +1 -2
package/src/api/atlas-sprite-sheet/atlas-sprite-sheet.service.js +40 -7
package/src/api/document/document.service.js +1 -1
package/src/api/file/file.controller.js +3 -1
package/src/api/file/file.service.js +28 -5
package/src/api/ipfs/ipfs.service.js +2 -2
package/src/api/object-layer/object-layer.controller.js +6 -2
package/src/api/object-layer/object-layer.model.js +67 -21
package/src/api/object-layer/object-layer.router.js +668 -42
package/src/api/object-layer/object-layer.service.js +10 -16
package/src/api/object-layer-render-frames/object-layer-render-frames.model.js +1 -2
package/src/api/user/user.router.js +10 -5
package/src/api/user/user.service.js +7 -7
package/src/cli/baremetal.js +6 -10
package/src/cli/cloud-init.js +0 -3
package/src/cli/db.js +54 -71
package/src/cli/deploy.js +64 -12
package/src/cli/env.js +5 -5
package/src/cli/fs.js +0 -2
package/src/cli/image.js +0 -3
package/src/cli/index.js +41 -13
package/src/cli/monitor.js +5 -6
package/src/cli/repository.js +329 -46
package/src/cli/run.js +210 -122
package/src/cli/secrets.js +1 -3
package/src/cli/ssh.js +1 -1
package/src/client/Itemledger.index.js +1 -959
package/src/client/Underpost.index.js +36 -0
package/src/client/components/core/AgGrid.js +20 -5
package/src/client/components/core/Alert.js +2 -2
package/src/client/components/core/Content.js +22 -3
package/src/client/components/core/Docs.js +30 -6
package/src/client/components/core/FileExplorer.js +71 -4
package/src/client/components/core/Input.js +1 -1
package/src/client/components/core/Modal.js +22 -6
package/src/client/components/core/PublicProfile.js +3 -3
package/src/client/components/core/RichText.js +1 -2
package/src/client/components/core/Router.js +34 -1
package/src/client/components/core/Worker.js +1 -1
package/src/client/components/cryptokoyn/CssCryptokoyn.js +63 -1
package/src/client/components/cyberia/ObjectLayerEngineModal.js +145 -119
package/src/client/components/cyberia/ObjectLayerEngineViewer.js +64 -6
package/src/client/components/cyberia-portal/CommonCyberiaPortal.js +1 -0
package/src/client/components/cyberia-portal/CssCyberiaPortal.js +44 -2
package/src/client/components/cyberia-portal/LogInCyberiaPortal.js +0 -1
package/src/client/components/cyberia-portal/MenuCyberiaPortal.js +64 -2
package/src/client/components/cyberia-portal/RoutesCyberiaPortal.js +1 -0
package/src/client/components/itemledger/CssItemledger.js +62 -0
package/src/client/components/underpost/CommonUnderpost.js +29 -0
package/src/client/components/underpost/CssUnderpost.js +281 -0
package/src/client/components/underpost/CyberpunkBloggerUnderpost.js +879 -0
package/src/client/components/underpost/DocumentSearchProvider.js +448 -0
package/src/client/components/underpost/ElementsUnderpost.js +38 -0
package/src/client/components/underpost/LabGalleryUnderpost.js +82 -0
package/src/client/components/underpost/LogInUnderpost.js +23 -0
package/src/client/components/underpost/LogOutUnderpost.js +15 -0
package/src/client/components/underpost/MenuUnderpost.js +691 -0
package/src/client/components/underpost/RoutesUnderpost.js +47 -0
package/src/client/components/underpost/SettingsUnderpost.js +16 -0
package/src/client/components/underpost/SignUpUnderpost.js +9 -0
package/src/client/components/underpost/SocketIoUnderpost.js +54 -0
package/src/client/components/underpost/TranslateUnderpost.js +10 -0
package/src/client/public/cryptokoyn/assets/logo/base-icon.png +0 -0
package/src/client/public/cryptokoyn/browserconfig.xml +12 -0
package/src/client/public/cryptokoyn/microdata.json +85 -0
package/src/client/public/cryptokoyn/site.webmanifest +57 -0
package/src/client/public/cryptokoyn/sitemap +3 -3
package/src/client/public/default/sitemap +3 -3
package/src/client/public/itemledger/browserconfig.xml +2 -2
package/src/client/public/itemledger/manifest.webmanifest +4 -4
package/src/client/public/itemledger/microdata.json +71 -0
package/src/client/public/itemledger/sitemap +3 -3
package/src/client/public/itemledger/yandex-browser-manifest.json +2 -2
package/src/client/public/test/sitemap +3 -3
package/src/client/services/object-layer/object-layer.management.js +23 -4
package/src/client/ssr/body/404.js +15 -11
package/src/client/ssr/body/500.js +15 -11
package/src/client/ssr/body/SwaggerDarkMode.js +285 -0
package/src/client/ssr/body/UnderpostDefaultSplashScreen.js +83 -0
package/src/client/ssr/head/PwaItemledger.js +60 -0
package/src/client/ssr/head/UnderpostScripts.js +6 -0
package/src/client/ssr/offline/NoNetworkConnection.js +11 -10
package/src/client/ssr/pages/Test.js +11 -10
package/src/client.build.js +0 -3
package/src/client.dev.js +0 -3
package/src/db/DataBaseProvider.js +17 -2
package/src/db/mariadb/MariaDB.js +14 -9
package/src/db/mongo/MongooseDB.js +17 -1
package/src/index.js +1 -1
package/src/proxy.js +0 -3
package/src/runtime/express/Express.js +15 -9
package/src/runtime/lampp/Lampp.js +6 -13
package/src/server/auth.js +12 -14
package/src/server/backup.js +2 -3
package/src/server/besu-genesis-generator.js +1630 -0
package/src/server/client-build-docs.js +126 -17
package/src/server/client-build-live.js +9 -18
package/src/server/client-build.js +203 -75
package/src/server/client-dev-server.js +14 -13
package/src/server/conf.js +376 -164
package/src/server/cron.js +2 -1
package/src/server/dns.js +28 -12
package/src/server/downloader.js +0 -2
package/src/server/logger.js +27 -9
package/src/server/object-layer.js +92 -16
package/src/server/peer.js +0 -2
package/src/server/process.js +1 -50
package/src/server/proxy.js +4 -8
package/src/server/runtime.js +5 -8
package/src/server/semantic-layer-generator.js +1 -0
package/src/server/ssr.js +0 -3
package/src/server/start.js +19 -12
package/src/server/tls.js +0 -2
package/src/server.js +0 -4
package/.env.development +0 -43
package/.env.test +0 -43
package/hardhat/contracts/CryptoKoyn.sol +0 -59
package/hardhat/contracts/ItemLedger.sol +0 -73
package/hardhat/contracts/Lock.sol +0 -34
package/hardhat/hardhat.config.cjs +0 -45
package/hardhat/ignition/modules/Lock.js +0 -18
package/hardhat/networks/cryptokoyn-itemledger.network.json +0 -29
package/hardhat/scripts/deployCryptokoyn.cjs +0 -25
package/hardhat/scripts/deployItemledger.cjs +0 -25
package/hardhat/test/Lock.js +0 -126
package/hardhat/white-paper.md +0 -581
package/white-paper.md +0 -581

package/src/server/client-build.js CHANGED Viewed

@@ -15,9 +15,9 @@ import {
   orderArrayFromAttrInt,
   uniqueArray,
 } from '../client/components/core/CommonJs.js';
+import { readConfJson } from './conf.js';
 import UglifyJS from 'uglify-js';
 import { minify } from 'html-minifier-terser';
-import dotenv from 'dotenv';
 import AdmZip from 'adm-zip';
 import * as dir from 'path';
 import { shellExec } from './process.js';
@@ -28,8 +28,6 @@ import Underpost from '../index.js';
 import { buildDocs } from './client-build-docs.js';
 import { ssrFactory } from './ssr.js';
-dotenv.config();
 // Static Site Generation (SSG)
 /**
@@ -77,23 +75,186 @@ const copyNonExistingFiles = (src, dest) => {
   }
 };
+/** @type {string} Default XSL sitemap template used when no `sitemap` source file exists in the public directory. */
+const defaultSitemapXsl = `<?xml version="1.0" encoding="UTF-8"?>
+<xsl:stylesheet version="1.0"
+    xmlns:html="http://www.w3.org/TR/REC-html40"
+    xmlns:image="http://www.google.com/schemas/sitemap-image/1.1"
+    xmlns:sitemap="http://www.sitemaps.org/schemas/sitemap/0.9"
+    xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+    <xsl:output method="html" version="1.0" encoding="UTF-8" indent="yes" />
+    <xsl:template match="/">
+        <html xmlns="http://www.w3.org/1999/xhtml">
+            <head>
+                <title>XML Sitemap</title>
+                <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+                <style type="text/css">
+                    body {
+                    font-family: sans-serif;
+                    font-size: 16px;
+                    color: #242628;
+                    }
+                    a {
+                    color: #000;
+                    text-decoration: none;
+                    }
+                    a:hover {
+                    text-decoration: underline;
+                    }
+                    table {
+                    border: none;
+                    border-collapse: collapse;
+                    width: 100%
+                    }
+                    th {
+                    text-align: left;
+                    padding-right: 30px;
+                    font-size: 11px;
+                    }
+                    thead th {
+                    border-bottom: 1px solid #7d878a;
+                    cursor: pointer;
+                    }
+                    td {
+                    font-size:11px;
+                    padding: 5px;
+                    }
+                    tr:nth-child(odd) td {
+                    background-color: rgba(0,0,0,0.04);
+                    }
+                    tr:hover td {
+                    background-color: #e2edf2;
+                    }
+                    #content {
+                    margin: 0 auto;
+                    padding: 2% 5%;
+                    max-width: 800px;
+                    }
+                    .desc {
+                    margin: 18px 3px;
+                    line-height: 1.2em;
+                    }
+                    .desc a {
+                    color: #5ba4e5;
+                    }
+                </style>
+            </head>
+            <body>
+                <div id="content">
+                    <h1>XML Sitemap</h1>
+                    <p class="desc"> This is a sitemap generated by <a
+                            href="{{web-url}}">{{web-url}}</a>
+                    </p>
+                    <xsl:if test="count(sitemap:sitemapindex/sitemap:sitemap) &gt; 0">
+                        <table id="sitemap" cellpadding="3">
+                            <thead>
+                                <tr>
+                                    <th width="75%">Sitemap</th>
+                                    <th width="25%">Last Modified</th>
+                                </tr>
+                            </thead>
+                            <tbody>
+                                <xsl:for-each select="sitemap:sitemapindex/sitemap:sitemap">
+                                    <xsl:variable name="sitemapURL">
+                                        <xsl:value-of select="sitemap:loc" />
+                                    </xsl:variable>
+                                <tr>
+                                        <td>
+                                            <a href="{$sitemapURL}">
+                                                <xsl:value-of select="sitemap:loc" />
+                                            </a>
+                                        </td>
+                                        <td>
+                                            <xsl:value-of
+                                                select="concat(substring(sitemap:lastmod,0,11),concat(' ', substring(sitemap:lastmod,12,5)))" />
+                                        </td>
+                                    </tr>
+                                </xsl:for-each>
+                            </tbody>
+                        </table>
+                    </xsl:if>
+                    <xsl:if test="count(sitemap:sitemapindex/sitemap:sitemap) &lt; 1">
+                        <p class="desc">
+                            <a href="{{web-url}}sitemap.xml" class="back-link">&#8592; Back to index</a>
+                        </p>
+                        <table
+                            id="sitemap" cellpadding="3">
+                            <thead>
+                                <tr>
+                                    <th width="70%">URL (<xsl:value-of
+                                            select="count(sitemap:urlset/sitemap:url)" /> total)</th>
+                                    <th width="15%">Images</th>
+                                    <th title="Last Modification Time" width="15%">Last Modified</th>
+                                </tr>
+                            </thead>
+                            <tbody>
+                                <xsl:variable name="lower" select="'abcdefghijklmnopqrstuvwxyz'" />
+                                <xsl:variable name="upper" select="'ABCDEFGHIJKLMNOPQRSTUVWXYZ'" />
+                                <xsl:for-each select="sitemap:urlset/sitemap:url">
+                                    <tr>
+                                        <td>
+                                            <xsl:variable name="itemURL">
+                                                <xsl:value-of select="sitemap:loc" />
+                                            </xsl:variable>
+                                            <a href="{$itemURL}">
+                                                <xsl:value-of select="sitemap:loc" />
+                                            </a>
+                                        </td>
+                                        <td>
+                                            <xsl:value-of select="count(image:image)" />
+                                        </td>
+                                        <td>
+                                            <xsl:value-of
+                                                select="concat(substring(sitemap:lastmod,0,11),concat(' ', substring(sitemap:lastmod,12,5)))" />
+                                        </td>
+                                    </tr>
+                                </xsl:for-each>
+                            </tbody>
+                        </table>
+                        <p
+                            class="desc">
+                            <a href="{{web-url}}sitemap.xml" class="back-link">&#8592; Back to index</a>
+                        </p>
+                    </xsl:if>
+                </div>
+            </body>
+        </html>
+    </xsl:template>
+</xsl:stylesheet>`;
 /**
  * @async
  * @function buildClient
  * @memberof clientBuild
  * @param {Object} options - Options for the build process.
+ * @param {string} options.deployId - The deployment ID for which to build the client.
  * @param {Array} options.liveClientBuildPaths - List of paths to build incrementally.
  * @param {Array} options.instances - List of instances to build.
  * @param {boolean} options.buildZip - Whether to create zip files of the builds.
+ * @param {boolean} options.fullBuild - Whether to perform a full build.
+ * @param {boolean} options.iconsBuild - Whether to build icons.
  * @returns {Promise<void>} - Promise that resolves when the build is complete.
  * @throws {Error} - If the build fails.
  * @memberof clientBuild
  */
-const buildClient = async (options = { liveClientBuildPaths: [], instances: [], buildZip: false }) => {
+const buildClient = async (
+  options = {
+    deployId: '',
+    liveClientBuildPaths: [],
+    instances: [],
+    buildZip: false,
+    fullBuild: false,
+    iconsBuild: false,
+  },
+) => {
   const logger = loggerFactory(import.meta);
-  const confClient = JSON.parse(fs.readFileSync(`./conf/conf.client.json`, 'utf8'));
-  const confServer = JSON.parse(fs.readFileSync(`./conf/conf.server.json`, 'utf8'));
-  const confSSR = JSON.parse(fs.readFileSync(`./conf/conf.ssr.json`, 'utf8'));
+  const deployId = options.deployId || process.env.DEPLOY_ID;
+  const confClient = readConfJson(deployId, 'client');
+  const confServer = readConfJson(deployId, 'server', { loadReplicas: true });
+  const confSSR = readConfJson(deployId, 'ssr');
   const packageData = JSON.parse(fs.readFileSync(`./package.json`, 'utf8'));
   const acmeChallengePath = `/.well-known/acme-challenge`;
   const publicPath = `./public`;
@@ -178,26 +339,7 @@ const buildClient = async (options = { liveClientBuildPaths: [], instances: [],
           } */,
       );
     } else if (fs.existsSync(`./engine-private/src/client/public/${publicClientId}`)) {
-      switch (publicClientId) {
-        case 'mysql_test':
-          if (db) {
-            fs.copySync(`./engine-private/src/client/public/${publicClientId}`, rootClientPath);
-            fs.writeFileSync(
-              `${rootClientPath}/index.php`,
-              fs
-                .readFileSync(`${rootClientPath}/index.php`, 'utf8')
-                .replace('test_servername', 'localhost')
-                .replace('test_username', db.user)
-                .replace('test_password', db.password)
-                .replace('test_dbname', db.name),
-              'utf8',
-            );
-          } else logger.error('not provided db config');
-          break;
-        default:
-          break;
-      }
+      fs.copySync(`./engine-private/src/client/public/${publicClientId}`, rootClientPath);
     }
     if (dists)
       for (const dist of dists) {
@@ -243,17 +385,14 @@ const buildClient = async (options = { liveClientBuildPaths: [], instances: [],
         client,
         directory,
         disabledRebuild,
-        minifyBuild,
         db,
         redirect,
         apis,
-        iconsBuild,
-        docsBuild,
         apiBaseProxyPath,
         apiBaseHost,
         ttiLoadTimeLimit,
         singleReplica,
-        offlineBuild,
+        docs,
       } = confServer[host][path];
       if (singleReplica) continue;
       if (!confClient[client]) confClient[client] = {};
@@ -267,9 +406,10 @@ const buildClient = async (options = { liveClientBuildPaths: [], instances: [],
       const rootClientPath = directory ? directory : `${publicPath}/${host}${path}`;
       const port = newInstance(currentPort);
       const publicClientId = publicRef ? publicRef : client;
-      const fullBuildEnabled = !confServer[host][path].liteBuild && !enableLiveRebuild;
+      const fullBuildEnabled = options.fullBuild && !enableLiveRebuild;
       // const baseHost = process.env.NODE_ENV === 'production' ? `https://${host}` : `http://localhost:${port}`;
       const baseHost = process.env.NODE_ENV === 'production' ? `https://${host}` : ``;
+      const minifyBuild = process.env.NODE_ENV === 'production';
       // ''; // process.env.NODE_ENV === 'production' ? `https://${host}` : ``;
       currentPort++;
@@ -291,7 +431,7 @@ const buildClient = async (options = { liveClientBuildPaths: [], instances: [],
           rootClientPath,
           acmeChallengeFullPath,
           publicClientId,
-          iconsBuild,
+          iconsBuild: options.iconsBuild,
           metadata,
           publicCopyNonExistingFiles,
         });
@@ -315,11 +455,7 @@ const buildClient = async (options = { liveClientBuildPaths: [], instances: [],
               'components',
               baseHost,
             );
-            fs.writeFileSync(
-              jsPublicPath,
-              minifyBuild || process.env.NODE_ENV === 'production' ? UglifyJS.minify(jsSrc).code : jsSrc,
-              'utf8',
-            );
+            fs.writeFileSync(jsPublicPath, minifyBuild ? UglifyJS.minify(jsSrc).code : jsSrc, 'utf8');
           }
         }
@@ -341,11 +477,7 @@ const buildClient = async (options = { liveClientBuildPaths: [], instances: [],
               'services',
               baseHost,
             );
-            fs.writeFileSync(
-              jsPublicPath,
-              minifyBuild || process.env.NODE_ENV === 'production' ? UglifyJS.minify(jsSrc).code : jsSrc,
-              'utf8',
-            );
+            fs.writeFileSync(jsPublicPath, minifyBuild ? UglifyJS.minify(jsSrc).code : jsSrc, 'utf8');
           }
         }
@@ -363,11 +495,7 @@ const buildClient = async (options = { liveClientBuildPaths: [], instances: [],
               'services',
               baseHost,
             );
-            fs.writeFileSync(
-              jsPublicPath,
-              minifyBuild || process.env.NODE_ENV === 'production' ? UglifyJS.minify(jsSrc).code : jsSrc,
-              'utf8',
-            );
+            fs.writeFileSync(jsPublicPath, minifyBuild ? UglifyJS.minify(jsSrc).code : jsSrc, 'utf8');
           }
         }
       }
@@ -387,11 +515,7 @@ const buildClient = async (options = { liveClientBuildPaths: [], instances: [],
         if (!(enableLiveRebuild && !options.liveClientBuildPaths.find((p) => p.srcBuildPath === jsSrcPath))) {
           const jsSrc = viewFormatted(await srcFormatted(fs.readFileSync(jsSrcPath, 'utf8')), dists, path, baseHost);
-          fs.writeFileSync(
-            jsPublicPath,
-            minifyBuild || process.env.NODE_ENV === 'production' ? UglifyJS.minify(jsSrc).code : jsSrc,
-            'utf8',
-          );
+          fs.writeFileSync(jsPublicPath, minifyBuild ? UglifyJS.minify(jsSrc).code : jsSrc, 'utf8');
         }
         if (
@@ -418,11 +542,7 @@ const buildClient = async (options = { liveClientBuildPaths: [], instances: [],
               baseHost,
             );
-            fs.writeFileSync(
-              `${buildPath}${buildId}.js`,
-              minifyBuild || process.env.NODE_ENV === 'production' ? UglifyJS.minify(jsSrc).code : jsSrc,
-              'utf8',
-            );
+            fs.writeFileSync(`${buildPath}${buildId}.js`, minifyBuild ? UglifyJS.minify(jsSrc).code : jsSrc, 'utf8');
             const title = metadata.title ? metadata.title : title;
             const canonicalURL = `https://${host}${path}${
@@ -559,7 +679,7 @@ const buildClient = async (options = { liveClientBuildPaths: [], instances: [],
             fs.writeFileSync(
               `${buildPath}index.html`,
-              minifyBuild || process.env.NODE_ENV === 'production'
+              minifyBuild
                 ? await minify(htmlSrc, {
                     minifyCSS: true,
                     minifyJS: true,
@@ -573,36 +693,43 @@ const buildClient = async (options = { liveClientBuildPaths: [], instances: [],
           }
       }
       if (!enableLiveRebuild && siteMapLinks.length > 0) {
-        const xslUrl = fs.existsSync(`${rootClientPath}/sitemap`)
-          ? `${path === '/' ? '' : path}/sitemap.xsl`
-          : undefined;
-        // Create a stream to write to
+        const hasSitemapTemplate = fs.existsSync(`${rootClientPath}/sitemap`);
+        const sitemapBaseUrl = `https://${host}${path === '/' ? '' : path}`;
+        // Create a stream to write to — omit xslUrl so we can inject a relative href below
         /** @type {import('sitemap').SitemapStreamOptions} */
-        const sitemapOptions = { hostname: `https://${host}`, xslUrl };
+        const sitemapOptions = { hostname: `https://${host}` };
         const siteMapStream = new SitemapStream(sitemapOptions);
         let siteMapSrc = await new Promise((resolve) =>
           streamToPromise(Readable.from(siteMapLinks).pipe(siteMapStream)).then((data) => resolve(data.toString())),
         );
+        // Inject a relative xml-stylesheet PI so the XSL loads from the same origin
+        // (works on both http://localhost:<port> and https://production-host)
+        siteMapSrc = siteMapSrc.replace(
+          '<?xml version="1.0" encoding="UTF-8"?>',
+          '<?xml version="1.0" encoding="UTF-8"?><?xml-stylesheet type="text/xsl" href="sitemap.xsl"?>',
+        );
         // Return a promise that resolves with your XML string
         fs.writeFileSync(`${rootClientPath}/sitemap.xml`, siteMapSrc, 'utf8');
-        if (xslUrl)
-          fs.writeFileSync(
-            `${rootClientPath}/sitemap.xsl`,
-            fs.readFileSync(`${rootClientPath}/sitemap`, 'utf8').replaceAll('{{web-url}}', `https://${host}${path}`),
-            'utf8',
-          );
+        // Generate XSL stylesheet from source template or default fallback
+        const xslTemplate = hasSitemapTemplate
+          ? fs.readFileSync(`${rootClientPath}/sitemap`, 'utf8')
+          : defaultSitemapXsl;
+        const webUrl = `https://${host}${path === '/' ? '/' : `${path}/`}`;
+        fs.writeFileSync(`${rootClientPath}/sitemap.xsl`, xslTemplate.replaceAll('{{web-url}}', webUrl), 'utf8');
         fs.writeFileSync(
           `${rootClientPath}/robots.txt`,
           `User-agent: *
-Sitemap: https://${host}${path === '/' ? '' : path}/sitemap.xml`,
+Sitemap: ${sitemapBaseUrl}/sitemap.xml`,
           'utf8',
         );
       }
-      if (fullBuildEnabled && !enableLiveRebuild && docsBuild) {
+      if (fullBuildEnabled && docs) {
         await buildDocs({
           host,
           path,
@@ -612,13 +739,14 @@ Sitemap: https://${host}${path === '/' ? '' : path}/sitemap.xml`,
           publicClientId,
           rootClientPath,
           packageData,
+          docs,
         });
       }
       if (client) {
         let PRE_CACHED_RESOURCES = [];
-        if (views && offlineBuild && fs.existsSync(`${rootClientPath}/sw.js`)) {
+        if (views && fs.existsSync(`${rootClientPath}/sw.js`)) {
           PRE_CACHED_RESOURCES = await fs.readdir(rootClientPath, { recursive: true });
           PRE_CACHED_RESOURCES = views
             .map((view) => `${path === '/' ? '' : path}${view.path}`)
@@ -637,7 +765,7 @@ Sitemap: https://${host}${path === '/' ? '' : path}/sitemap.xml`,
               const htmlSrc = Render({
                 title: page.title,
                 ssrPath,
-                ssrHeadComponents: '',
+                ssrHeadComponents: '<base target="_top">',
                 ssrBodyComponents: SsrComponent(),
                 renderPayload: {
                   apiBaseProxyPath,
@@ -665,7 +793,7 @@ Sitemap: https://${host}${path === '/' ? '' : path}/sitemap.xml`,
               fs.writeFileSync(
                 buildHtmlPath,
-                minifyBuild || process.env.NODE_ENV === 'production'
+                minifyBuild
                   ? await minify(htmlSrc, {
                       minifyCSS: true,
                       minifyJS: true,

package/src/server/client-dev-server.js CHANGED Viewed

@@ -5,8 +5,10 @@
  */
 import fs from 'fs-extra';
 import nodemon from 'nodemon';
+import dotenv from 'dotenv';
 import { shellExec } from './process.js';
 import { loggerFactory } from './logger.js';
+import Underpost from '../index.js';
 const logger = loggerFactory(import.meta);
@@ -21,22 +23,20 @@ const logger = loggerFactory(import.meta);
  * @returns {void}
  * @memberof clientDevServer
  */
-const createClientDevServer = (
+const createClientDevServer = async (
   deployId = process.argv[2] || 'dd-default',
   subConf = process.argv[3] || '',
   host = process.argv[4] || 'default.net',
   path = process.argv[5] || '/',
 ) => {
-  shellExec(
-    `env-cmd -f ./engine-private/conf/${deployId}/.env.${process.env.NODE_ENV}.${subConf}-dev-client node bin/deploy build-full-client ${deployId} ${subConf}-dev-client ${host} ${path}`.trim(),
-  );
+  const devClientEnvPath = `./engine-private/conf/${deployId}/.env.${process.env.NODE_ENV}.${subConf}-dev-client`;
+  if (fs.existsSync(devClientEnvPath)) dotenv.config({ path: devClientEnvPath, override: true });
-  shellExec(
-    `env-cmd -f ./engine-private/conf/${deployId}/.env.${process.env.NODE_ENV}.${subConf}-dev-client node src/server ${deployId} ${subConf}-dev-client`.trim(),
-    {
-      async: true,
-    },
-  );
+  await Underpost.repo.client(deployId, `${subConf}-dev-client`.trim(), host, path);
+  shellExec(`node src/server ${deployId} ${subConf}-dev-client`.trim(), {
+    async: true,
+  });
   // https://github.com/remy/nodemon/blob/main/doc/events.md
@@ -47,7 +47,7 @@ const createClientDevServer = (
   // restart([ array of files triggering the restart ]) - child process has restarted
   // config:update - nodemon's config has changed
-  if (fs.existsSync(`./tmp/client.build.json`)) fs.removeSync(`./tmp/client.build.json`);
+  if (fs.existsSync(`/tmp/client.build.json`)) fs.removeSync(`/tmp/client.build.json`);
   let buildPathScope = [];
@@ -77,10 +77,11 @@ const createClientDevServer = (
       }, 2500);
       const buildPathScopeBuild = buildPathScope.map((o) => o.path);
       logger.info('buildPathScopeBuild', buildPathScopeBuild);
-      fs.writeFileSync(`./tmp/client.build.json`, JSON.stringify(buildPathScopeBuild, null, 4));
+      fs.writeFileSync(`/tmp/client.build.json`, JSON.stringify(buildPathScopeBuild, null, 4));
     })
     .on('crash', function (error) {
-      logger.error(error, error.message);
+      if (error) logger.error(error, error.message || 'nodemon crash');
+      else logger.error('nodemon process crashed');
     });
 };