@underpostnet/cyberia 3.2.90 → 3.3.73

package/src/cli/package.js

@@ -0,0 +1,90 @@
+/**
+ * Package domain: the manifests a deploy id owns.
+ *
+ * Every generated `package.json` in the project comes from one builder,
+ * {@link module:src/server/build/package.js}: a deploy id's own manifest under
+ * `engine-private/conf/<deploy-id>/`, the standalone product CLI's, and the copy published with
+ * a product's instances. This domain is the operator surface over that builder — the place a
+ * person or a workflow asks for those manifests by deploy id, rather than each build script
+ * merging dependency maps its own way.
+ *
+ * What a deploy adds to the engine's manifest is declared in its product catalog
+ * (`packageName`, `packageBin`, `packageDependencies`, `packageScripts`); a deploy id without a
+ * catalog is the engine manifest under its own identity, which is the default and needs no
+ * declaration.
+ * @module src/cli/package.js
+ * @namespace UnderpostPackage
+ */
+
+import { loggerFactory } from '../server/ops/logger.js';
+import {
+  installDeployDependencies,
+  renamePackage,
+  setPackageRepository,
+  syncDeployPackages,
+} from '../server/build/package.js';
+import Underpost from '../index.js';
+
+const logger = loggerFactory(import.meta);
+
+/**
+ * @class UnderpostPackage
+ * @description Generates the package manifests a deploy id owns, and installs what its catalog pins.
+ * @memberof UnderpostPackage
+ */
+class UnderpostPackage {
+  static API = {
+    /**
+     * @method callback
+     * @description Runs the requested package operations for a deploy id, or for every deploy id
+     * in the private configuration tree when none is named. With no operation selected, `--sync`
+     * is what the command is for and is what it does.
+     * @param {string} [deployId] - Deploy id to act on; every deploy id with a manifest otherwise.
+     * @param {object} [options] - Command options.
+     * @param {boolean} [options.sync] - Regenerate the deploy manifests from the engine's and the catalog.
+     * @param {boolean} [options.install] - Install the deploy catalog's pinned dependencies into this checkout.
+     * @param {string} [options.rename] - Rename this checkout's package, manifest and lockfile together.
+     * @param {string} [options.setRepo] - Point this checkout's package at a repository.
+     * @param {boolean} [options.dryRun] - Resolve what `--sync` would write without writing it.
+     * @returns {Promise<{synced: Array<object>, installed: string[], renamed: string, repository: object}>} What the run resolved.
+     * @memberof UnderpostPackage
+     */
+    async callback(deployId = '', options = {}) {
+      const deployIds = `${deployId ?? ''}`
+        .split(',')
+        .map((id) => id.trim())
+        .filter(Boolean);
+      const install = options.install === true;
+      const rename = `${options.rename ?? ''}`.trim();
+      const setRepo = `${options.setRepo ?? ''}`.trim();
+      const sync = options.sync === true || !(install || rename || setRepo);
+
+      const synced = sync ? await syncDeployPackages({ deployIds, dryRun: options.dryRun === true }) : [];
+
+      const installed = [];
+      if (install) {
+        // The pins are a deploy's own declaration, so there is no meaningful "install every
+        // deploy's dependencies" into one checkout.
+        if (deployIds.length === 0) throw new Error('[package] --install requires a deploy id');
+        for (const id of deployIds) installed.push(...(await installDeployDependencies(id)));
+      }
+
+      const renamed = rename ? renamePackage({ name: rename }).name : '';
+      const { repository } = setRepo
+        ? setPackageRepository({ slug: Underpost.repo.repoSlugFactory(setRepo) })
+        : { repository: null };
+
+      logger.info('Package operations complete', {
+        deployIds: deployIds.length > 0 ? deployIds : 'all',
+        synced: synced.map(({ deployId: id, name }) => `${id} → ${name}`),
+        installed,
+        renamed: renamed || null,
+        repository: repository?.url ?? null,
+        dryRun: options.dryRun === true,
+      });
+      return { synced, installed, renamed, repository };
+    },
+  };
+}
+
+export default UnderpostPackage;

package/src/cli/release.js

@@ -12,9 +12,9 @@
 import fs from 'fs-extra';
 import path from 'path';
 import dotenv from 'dotenv';
-import { pbcopy, shellCd, shellExec } from '../server/process.js';
-import { Dns } from '../server/dns.js';
-import { loggerFactory } from '../server/logger.js';
+import { pbcopy, shellCd, shellExec } from '../server/runtime/process.js';
+import { Dns } from '../server/network/dns.js';
+import { loggerFactory } from '../server/ops/logger.js';
 import { timer } from '../client/components/core/CommonJs.js';
 import Underpost from '../index.js';
 
@@ -56,6 +56,10 @@ const buildVersionBumpTargets = () => [
     file: 'src/index.js',
     patterns: /(static version = ['"]v)\d+\.\d+\.\d+(?=['"])/g,
   },
+  {
+    file: 'src/cli/run.js',
+    patterns: /(const version = ['"]v)\d+\.\d+\.\d+(?=['"])/g,
+  },
 
   // ── README + CLI-HELP fallbacks. CLI-HELP is regenerated by `deploy cli-docs`, but bump
   //    it too so the file is consistent if the regeneration step is skipped. ──
@@ -77,13 +81,19 @@ const buildVersionBumpTargets = () => [
   {
     dir: 'src/client/public/cyberia-docs',
     match: /\.md$/,
-    patterns: [/(\*\*(?:Current )?[Vv]ersion:\*\* )\d+\.\d+\.\d+/g, /(underpost\/[a-z0-9-]+:v)\d+\.\d+\.\d+/g],
+    patterns: [
+      /(\*\*(?:Current )?[Vv]ersion:\*\* )\d+\.\d+\.\d+/g,
+      /(underpost\/[a-z0-9-]+:v)\d+\.\d+\.\d+/g,
+      /(socket\.dev\/api\/badge\/npm\/package\/[a-z0-9-]+\/)\d+\.\d+\.\d+/g,
+      /(socket\.dev\/npm\/package\/[a-z0-9-]+\/overview\/)\d+\.\d+\.\d+/g,
+    ],
     recursive: true,
   },
   {
     dir: 'src/client/public/nexodev/docs/references',
     match: /\.md$/,
     patterns: [
+      /(\*\*(?:Current )?[Vv]ersion:\*\* )\d+\.\d+\.\d+/g,
       /(underpost\/[a-z0-9-]+:v)\d+\.\d+\.\d+/g,
       /(UNDERPOST_VERSION=)\d+\.\d+\.\d+/g,
       /(ci\/cd cli v)\d+\.\d+\.\d+/gi,
@@ -107,6 +117,14 @@ const buildVersionBumpTargets = () => [
     recursive: true,
   },
 
+  // ── Deployment runner scripts carry image defaults passed to deploy/sync commands. ──
+  {
+    dir: 'deploy',
+    match: /\.sh$/,
+    patterns: /(underpost\/[a-z0-9-]+:v)\d+\.\d+\.\d+/g,
+    recursive: true,
+  },
+
   // ── GitHub Actions workflows. Single sweep across docker-image.*.ci.yml, engine-*.cd.yml,
   //    and the root docker-image.ci.yml — replaces previous three separate loops. ──
   {
@@ -261,6 +279,19 @@ const bumpAuxiliaryFiles = (oldVersion, newVersion, { dryRun = false } = {}) =>
   return report;
 };
 
+/**
+ * Returns whether a manifest's canonical top-level version would change. Used by dry-runs
+ * because bumpp has no non-mutating API option.
+ */
+const wouldBumpManifestVersion = (filePath, newVersion) => {
+  try {
+    const manifest = JSON.parse(fs.readFileSync(filePath, 'utf8'));
+    return typeof manifest.version === 'string' && manifest.version !== newVersion;
+  } catch {
+    return false;
+  }
+};
+
 /**
  * Prints a per-file change summary table.
  */
@@ -338,7 +369,7 @@ async function buildAndTestTemplate(opts = {}) {
   // fs.writeFileSync(`${TEMPLATE_PATH}/.env`, envContent, 'utf8');
   fs.writeFileSync(`${TEMPLATE_PATH}/.env.example`, envContent, 'utf8');
   shellExec(`cd ${TEMPLATE_PATH} && npm install`);
-  shellExec(`cd ${TEMPLATE_PATH} && node bin env clean`);
+  shellExec(`cd ${TEMPLATE_PATH} && node bin app clean`);
   // Build + run in an isolated env so the template resolves dd-default from its own .env and
   // never inherits the engine's dd-cron deploy selection. See ISOLATED_ENV above.
   //
@@ -379,8 +410,8 @@ class UnderpostRelease {
      * 1. Loads production env and pulls latest code; kills dev servers on ports 4001-4003.
      * 2. Builds and smoke-tests the pwa-microservices-template (aborts on error).
      * 3. Canonical version files: delegates to `bumpp` (driven by `bump.config.js`). Bumps
-     *    package.json, package-lock.json (root + packages['']), and every
-     *    engine-private/conf/**\/package.json.
+     *    package.json, package-lock.json (root + packages['']), Hardhat's package metadata,
+     *    and every engine-private/conf/**\/package.json.
      * 4. Auxiliary files: anchored-regex walker over VERSION_BUMP_TARGETS — covers
      *    src/index.js, README, cyberia-docs, nexodev docs, manifests (deployment + cronjobs),
      *    .github/workflows (image tags, type=raw, UNDERPOST_VERSION build-args), and
@@ -420,26 +451,36 @@ class UnderpostRelease {
         if (!templateOk) return;
       }
 
-      // ── Canonical version files: delegate to bumpp (package.json, package-lock.json,
-      //    engine-private/conf/**/package.json). bumpp owns lockfile semantics (root version
-      //    + packages[''].version) so we don't reimplement them. ──
-      const { versionBump } = await import('bumpp');
-      const bumppResult = await versionBump({
-        release: newVersion,
-        files: [
-          'package.json',
-          'package-lock.json',
-          ...(fs.existsSync('./engine-private/conf') ? ['engine-private/conf/**/package.json'] : []),
-        ],
-        commit: false,
-        tag: false,
-        push: false,
-        confirm: false,
-        recursive: false,
-        ignoreScripts: true,
-        dry: dryRun,
-      });
-      logger.info(`bumpp updated ${bumppResult?.files?.length ?? 0} canonical file(s).`);
+      // ── Canonical version files: bumpp owns lockfile semantics (root version +
+      //    packages[''].version). Its API has no non-mutating dry-run, so previews inspect
+      //    manifest versions directly rather than invoking it. ──
+      const canonicalVersionFiles = [
+        'package.json',
+        'package-lock.json',
+        'hardhat/package.json',
+        'hardhat/package-lock.json',
+        ...walkDir('engine-private/conf', /^package\.json$/, true),
+      ];
+      if (dryRun) {
+        const pendingCanonicalFiles = canonicalVersionFiles.filter((file) =>
+          wouldBumpManifestVersion(file, newVersion),
+        );
+        logger.info(`bumpp would update ${pendingCanonicalFiles.length} canonical file(s).`);
+        for (const file of pendingCanonicalFiles) console.log(`  ${file}`);
+      } else {
+        const { versionBump } = await import('bumpp');
+        const bumppResult = await versionBump({
+          release: newVersion,
+          files: canonicalVersionFiles,
+          commit: false,
+          tag: false,
+          push: false,
+          confirm: false,
+          recursive: false,
+          ignoreScripts: true,
+        });
+        logger.info(`bumpp updated ${bumppResult?.updatedFiles?.length ?? 0} canonical file(s).`);
+      }
 
       // ── Auxiliary files: anchored-regex walker over VERSION_BUMP_TARGETS. ──
       const report = bumpAuxiliaryFiles(version, newVersion, { dryRun });
@@ -452,7 +493,7 @@ class UnderpostRelease {
 
       // ── Downstream regenerations and manifest sync (unchanged from previous flow). ──
       shellExec(`node bin/deploy cli-docs ${version} ${newVersion}`);
-      shellExec(`node bin/deploy update-dependencies`);
+      shellExec(`node bin package --sync`);
       shellExec(`node bin/build dd`);
       shellExec(`node bin run build-cluster-deployment-manifests`);
       shellExec(`node bin new --default-conf --conf-workflow-id template`);
@@ -484,8 +525,8 @@ class UnderpostRelease {
      */
     async ci(deployId, message, options) {
       dotenv.config({ path: `./engine-private/conf/dd-cron/.env.production`, override: true });
-      const suffix = deployId.replace(/^(dd-|engine-)/, '');
-      const repoName = `engine-${suffix}`;
+      const suffix = Underpost.repo.confIdFactory(deployId);
+      const repoName = Underpost.repo.engineRepoFactory(deployId);
       const buildTarget = `dd-${suffix}`;
       const githubOrg = process.env.GITHUB_USERNAME || 'underpostnet';
       shellCd('/home/dd');
@@ -578,9 +619,7 @@ class UnderpostRelease {
     async deploy(version, options) {
       dotenv.config({ path: `./engine-private/conf/dd-cron/.env.production`, override: true });
       killDevServers();
-      shellExec(
-        `node bin secret underpost --create-from-file /home/dd/engine/engine-private/conf/dd-cron/.env.production`,
-      );
+      shellExec(`node bin host load`);
       shellExec(`node bin/build dd --conf`);
       shellExec(`git add . && cd ./engine-private && git add .`);
       shellExec(`node bin cmt . ci package-pwa-microservices-template 'New release v:${version}'`);
@@ -591,5 +630,5 @@ class UnderpostRelease {
   };
 }
 
-export { UnderpostRelease };
+export { UnderpostRelease, bumpAuxiliaryFiles };
 export default UnderpostRelease;