@highstate/cli 0.21.1 → 0.27.0

package/dist/{chunk-n0q0pces.js → chunk-2s546hay.js}

@@ -1294,6 +1294,20 @@ import { resolve as resolve4 } from "path";
 import { encode } from "@msgpack/msgpack";
 import { Command as Command5, Option as Option3 } from "clipanion";
 import { readPackageJSON as readPackageJSON3, resolvePackageJSON as resolvePackageJSON4 } from "pkg-types";
+function formatUnknownError(error) {
+  if (error instanceof Error) {
+    return error.stack ?? error.message;
+  }
+  if (typeof error === "string") {
+    return error;
+  }
+  try {
+    return JSON.stringify(error);
+  } catch {
+    return String(error);
+  }
+}
+
 class BuildCommand extends Command5 {
   static paths = [["build"]];
   static usage = Command5.Usage({
@@ -1304,6 +1318,16 @@ class BuildCommand extends Command5 {
   silent = Option3.Boolean("--silent", true);
   noSourceHash = Option3.Boolean("--no-source-hash", false);
   async execute() {
+    try {
+      await this.build();
+    } catch (error) {
+      if (error instanceof Error) {
+        throw error;
+      }
+      throw new Error(`Build failed with non-error rejection: ${formatUnknownError(error)}`);
+    }
+  }
+  async build() {
     const packageJson = await readPackageJSON3();
     const highstateConfig = highstateConfigSchema.parse(packageJson.highstate ?? {});
     if (highstateConfig.type === "library") {
@@ -1383,10 +1407,12 @@ import { pathToFileURL as pathToFileURL2 } from "url";
 import { Command as Command6, UsageError } from "clipanion";
 import { consola as consola2 } from "consola";
 import { colorize } from "consola/utils";
-import { getPort } from "get-port-please";
+import { checkPort, getPort } from "get-port-please";
 import { resolve as importMetaResolve2 } from "import-meta-resolve";
 import { addDevDependency } from "nypm";
 import { readPackageJSON as readPackageJSON4, resolvePackageJSON as resolvePackageJSON5 } from "pkg-types";
+var shuttingDown = false;
+
 class DesignerCommand extends Command6 {
   static paths = [["designer"]];
   static usage = Command6.Usage({
@@ -1408,24 +1434,44 @@ class DesignerCommand extends Command6 {
     logger.info("starting highstate designer...");
     await getBackendServices();
     const oldConsoleLog = console.log;
-    const port = await getPort({ port: 3000 });
-    const eventsPort = await getPort({ port: 3001 });
+    const host = "127.0.0.1";
+    const configuredPort = process.env.HIGHSTATE_DESIGNER_PORT;
+    const port = configuredPort === undefined ? 7283 : Number(configuredPort);
+    if (!/^\d+$/.test(configuredPort ?? port.toString()) || port < 1 || port > 65535) {
+      throw new UsageError(`HIGHSTATE_DESIGNER_PORT must be an integer between "1" and "65535"`);
+    }
+    if (configuredPort !== undefined) {
+      logger.warn(`using custom designer port "%s"; changing the port changes the WebAuthn origin and may require registering security keys again`, port);
+    }
+    const availablePort = await checkPort(port, host);
+    if (!availablePort) {
+      throw new UsageError(`Port "${port}" is already in use`);
+    }
+    const eventsPort = await getPort({ random: true, host });
     const designerPackageJsonPath = importMetaResolve2("@highstate/designer/package.json", packageJsonUrl);
     const designerPackageJson = await readPackageJSON4(designerPackageJsonPath);
     process.env.NITRO_PORT = port.toString();
-    process.env.NITRO_HOST = "0.0.0.0";
+    process.env.NITRO_HOST = host;
+    process.env.NITRO_BUN_IDLE_TIMEOUT ??= "255";
     process.env.NUXT_PUBLIC_VERSION = designerPackageJson.version;
     process.env.NUXT_PUBLIC_EVENTS_PORT = eventsPort.toString();
-    await new Promise((resolve5) => {
-      console.log = (message) => {
-        if (message.startsWith("Listening on")) {
-          resolve5();
-        }
-      };
-      const serverPath = importMetaResolve2("@highstate/designer/server", packageJsonUrl);
-      import(serverPath);
-    });
-    console.log = oldConsoleLog;
+    try {
+      await new Promise((resolve5, reject) => {
+        console.log = (message) => {
+          if (message.startsWith("Listening on")) {
+            if (!message.includes(`http://${host}:${port}`)) {
+              reject(new Error(`Designer started on an unexpected endpoint: ${message}`));
+              return;
+            }
+            resolve5();
+          }
+        };
+        const serverPath = importMetaResolve2("@highstate/designer/server", packageJsonUrl);
+        import(serverPath).catch(reject);
+      });
+    } finally {
+      console.log = oldConsoleLog;
+    }
     consola2.log([
       `
   `,
@@ -1433,11 +1479,15 @@ class DesignerCommand extends Command6 {
       `
   `,
       colorize("greenBright", "\u279C Local:  "),
-      colorize("underline", colorize("cyanBright", `http://localhost:${port}`)),
+      colorize("underline", colorize("cyanBright", `http://highstate.localhost:${port}`)),
       `
 `
     ].join(""));
-    process.on("SIGINT", () => {
+    process.once("SIGINT", () => {
+      if (shuttingDown) {
+        return;
+      }
+      shuttingDown = true;
       process.stdout.write("\r");
       consola2.info("shutting down highstate designer...");
       setTimeout(() => process.exit(0), 1000);
@@ -1683,34 +1733,22 @@ class UpdateCommand extends Command12 {
     }
     const updatePlatform = this.platformOnly || !this.stdlibOnly;
     const updateStdlib = this.stdlibOnly || !this.platformOnly;
+    let currentPlatformVersion;
+    let resolvedStdlibVersion = this.stdlibVersion;
     if (this.stdlibOnly) {
-      const currentPlatformVersion = await getProjectPlatformVersion(projectRoot);
-      if (!currentPlatformVersion) {
+      const projectPlatformVersion = await getProjectPlatformVersion(projectRoot);
+      if (!projectPlatformVersion) {
         throw new Error('Current platform version is not set in overrides for "@highstate/pulumi"');
       }
-      const targetStdlibVersion = (this.stdlibVersion ?? "").trim();
-      if (targetStdlibVersion.length === 0) {
-        throw new Error('Flag "--stdlib-version" must be provided when using "--stdlib"');
-      }
-      const stdlibManifest = await fetchManifest("@highstate/library", targetStdlibVersion);
-      const supportedPlatformRange = getDependencyRange(stdlibManifest, "@highstate/pulumi");
-      if (!supportedPlatformRange) {
-        throw new Error(`Unable to infer "@highstate/pulumi" version from "@highstate/library@${targetStdlibVersion}"`);
-      }
-      const validPlatform = semver.valid(currentPlatformVersion);
-      if (!validPlatform) {
-        throw new Error(`Current platform version is not a valid semver "${currentPlatformVersion}"`);
-      }
-      const ok = semver.satisfies(validPlatform, supportedPlatformRange, {
-        includePrerelease: true
+      currentPlatformVersion = projectPlatformVersion;
+      resolvedStdlibVersion = await resolveCompatibleStdlibVersion({
+        currentPlatformVersion: projectPlatformVersion,
+        stdlibVersion: this.stdlibVersion
       });
-      if (!ok) {
-        throw new Error(`Current platform version "${currentPlatformVersion}" does not satisfy requirement "${supportedPlatformRange}"`);
-      }
     }
     const bundle = await resolveVersionBundle({
-      platformVersion: updatePlatform ? this.platformVersion : undefined,
-      stdlibVersion: updateStdlib ? this.stdlibVersion : undefined
+      platformVersion: updatePlatform ? this.platformVersion : currentPlatformVersion,
+      stdlibVersion: updateStdlib ? resolvedStdlibVersion : undefined
     });
     const overrides2 = buildOverrides(bundle);
     await applyOverrides({
@@ -1734,6 +1772,48 @@ class UpdateCommand extends Command12 {
     logger.info("update completed successfully");
   }
 }
+async function resolveCompatibleStdlibVersion(args) {
+  const validPlatform = semver.valid(args.currentPlatformVersion);
+  if (!validPlatform) {
+    throw new Error(`Current platform version is not a valid semver "${args.currentPlatformVersion}"`);
+  }
+  const targetStdlibVersion = args.stdlibVersion?.trim();
+  if (targetStdlibVersion) {
+    await assertStdlibSupportsPlatform({
+      currentPlatformVersion: validPlatform,
+      stdlibVersion: targetStdlibVersion
+    });
+    return targetStdlibVersion;
+  }
+  const packument = await fetchNpmPackument("@highstate/library");
+  const sortedVersions = Object.entries(packument.versions ?? {}).filter(([version]) => semver.valid(version)).sort(([a], [b]) => semver.rcompare(a, b));
+  for (const [stdlibVersion, stdlibManifest] of sortedVersions) {
+    const supportedPlatformRange = getDependencyRange(stdlibManifest, "@highstate/pulumi");
+    if (!supportedPlatformRange) {
+      continue;
+    }
+    const ok = semver.satisfies(validPlatform, supportedPlatformRange, {
+      includePrerelease: true
+    });
+    if (ok) {
+      return stdlibVersion;
+    }
+  }
+  throw new Error(`Unable to find "@highstate/library" version compatible with platform "${validPlatform}"`);
+}
+async function assertStdlibSupportsPlatform(args) {
+  const stdlibManifest = await fetchManifest("@highstate/library", args.stdlibVersion);
+  const supportedPlatformRange = getDependencyRange(stdlibManifest, "@highstate/pulumi");
+  if (!supportedPlatformRange) {
+    throw new Error(`Unable to infer "@highstate/pulumi" version from "@highstate/library@${args.stdlibVersion}"`);
+  }
+  const ok = semver.satisfies(args.currentPlatformVersion, supportedPlatformRange, {
+    includePrerelease: true
+  });
+  if (!ok) {
+    throw new Error(`Current platform version "${args.currentPlatformVersion}" does not satisfy requirement "${supportedPlatformRange}"`);
+  }
+}
 async function assertPackageJsonExists(projectRoot) {
   try {
     await readFile8(`${projectRoot}/package.json`, "utf8");

package/dist/commands/index.js

@@ -12,7 +12,7 @@ import {
   PackageRemoveCommand,
   PackageUpdateReferencesCommand,
   UpdateCommand
-} from "../chunk-n0q0pces.js";
+} from "../chunk-2s546hay.js";
 import"../chunk-vcev74he.js";
 export {
   UpdateCommand,

package/dist/highstate.manifest.json

@@ -1,6 +1,6 @@
 {
   "sourceHashes": {
-    "./dist/commands/index.js": 2077043253,
-    "./dist/main.js": 1478493098
+    "./dist/commands/index.js": 3807940790,
+    "./dist/main.js": 4186384902
   }
 }

package/dist/main.js

@@ -13,7 +13,7 @@ import {
   PackageRemoveCommand,
   PackageUpdateReferencesCommand,
   UpdateCommand
-} from "./chunk-n0q0pces.js";
+} from "./chunk-2s546hay.js";
 import"./chunk-vcev74he.js";
 
 // src/main.ts

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@highstate/cli",
-  "version": "0.21.1",
+  "version": "0.27.0",
   "description": "The CLI for the Highstate project.",
   "type": "module",
   "files": [
@@ -34,8 +34,8 @@
   },
   "dependencies": {
     "@aws-crypto/crc32": "^5.2.0",
-    "@highstate/backend": "0.20.0",
-    "@highstate/contract": "0.20.0",
+    "@highstate/backend": "0.26.0",
+    "@highstate/contract": "0.26.0",
     "@inquirer/prompts": "^7.8.6",
     "@msgpack/msgpack": "^3.1.2",
     "@pulumi/pulumi": "3.232.0",

package/src/commands/build.ts

@@ -12,6 +12,22 @@ import {
   schemaTransformerPlugin,
 } from "../shared"
 
+function formatUnknownError(error: unknown): string {
+  if (error instanceof Error) {
+    return error.stack ?? error.message
+  }
+
+  if (typeof error === "string") {
+    return error
+  }
+
+  try {
+    return JSON.stringify(error)
+  } catch {
+    return String(error)
+  }
+}
+
 export class BuildCommand extends Command {
   static paths = [["build"]]
 
@@ -25,6 +41,18 @@ export class BuildCommand extends Command {
   noSourceHash = Option.Boolean("--no-source-hash", false)
 
   async execute(): Promise<void> {
+    try {
+      await this.build()
+    } catch (error) {
+      if (error instanceof Error) {
+        throw error
+      }
+
+      throw new Error(`Build failed with non-error rejection: ${formatUnknownError(error)}`)
+    }
+  }
+
+  private async build(): Promise<void> {
     const packageJson = await readPackageJSON()
 
     const highstateConfig = highstateConfigSchema.parse(packageJson.highstate ?? {})

package/src/commands/designer.ts

@@ -2,12 +2,14 @@ import { pathToFileURL } from "node:url"
 import { Command, UsageError } from "clipanion"
 import { consola } from "consola"
 import { colorize } from "consola/utils"
-import { getPort } from "get-port-please"
+import { checkPort, getPort } from "get-port-please"
 import { resolve as importMetaResolve } from "import-meta-resolve"
 import { addDevDependency } from "nypm"
 import { readPackageJSON, resolvePackageJSON } from "pkg-types"
 import { getBackendServices, logger } from "../shared"
 
+let shuttingDown = false
+
 export class DesignerCommand extends Command {
   static paths = [["designer"]]
 
@@ -39,8 +41,26 @@ export class DesignerCommand extends Command {
 
     const oldConsoleLog = console.log
 
-    const port = await getPort({ port: 3000 })
-    const eventsPort = await getPort({ port: 3001 })
+    const host = "127.0.0.1"
+    const configuredPort = process.env.HIGHSTATE_DESIGNER_PORT
+    const port = configuredPort === undefined ? 7283 : Number(configuredPort)
+    if (!/^\d+$/.test(configuredPort ?? port.toString()) || port < 1 || port > 65535) {
+      throw new UsageError(`HIGHSTATE_DESIGNER_PORT must be an integer between "1" and "65535"`)
+    }
+
+    if (configuredPort !== undefined) {
+      logger.warn(
+        `using custom designer port "%s"; changing the port changes the WebAuthn origin and may require registering security keys again`,
+        port,
+      )
+    }
+
+    const availablePort = await checkPort(port, host)
+    if (!availablePort) {
+      throw new UsageError(`Port "${port}" is already in use`)
+    }
+
+    const eventsPort = await getPort({ random: true, host })
 
     const designerPackageJsonPath = importMetaResolve(
       "@highstate/designer/package.json",
@@ -49,22 +69,30 @@ export class DesignerCommand extends Command {
     const designerPackageJson = await readPackageJSON(designerPackageJsonPath)
 
     process.env.NITRO_PORT = port.toString()
-    process.env.NITRO_HOST = "0.0.0.0"
+    process.env.NITRO_HOST = host
+    process.env.NITRO_BUN_IDLE_TIMEOUT ??= "255"
     process.env.NUXT_PUBLIC_VERSION = designerPackageJson.version
     process.env.NUXT_PUBLIC_EVENTS_PORT = eventsPort.toString()
 
-    await new Promise<void>(resolve => {
-      console.log = (message: string) => {
-        if (message.startsWith("Listening on")) {
-          resolve()
+    try {
+      await new Promise<void>((resolve, reject) => {
+        console.log = (message: string) => {
+          if (message.startsWith("Listening on")) {
+            if (!message.includes(`http://${host}:${port}`)) {
+              reject(new Error(`Designer started on an unexpected endpoint: ${message}`))
+              return
+            }
+
+            resolve()
+          }
         }
-      }
-
-      const serverPath = importMetaResolve("@highstate/designer/server", packageJsonUrl)
-      void import(serverPath)
-    })
 
-    console.log = oldConsoleLog
+        const serverPath = importMetaResolve("@highstate/designer/server", packageJsonUrl)
+        void import(serverPath).catch(reject)
+      })
+    } finally {
+      console.log = oldConsoleLog
+    }
 
     consola.log(
       [
@@ -72,12 +100,17 @@ export class DesignerCommand extends Command {
         colorize("bold", colorize("cyanBright", "Highstate Designer")),
         "\n  ",
         colorize("greenBright", "➜ Local:  "),
-        colorize("underline", colorize("cyanBright", `http://localhost:${port}`)),
+        colorize("underline", colorize("cyanBright", `http://highstate.localhost:${port}`)),
         "\n",
       ].join(""),
     )
 
-    process.on("SIGINT", () => {
+    process.once("SIGINT", () => {
+      if (shuttingDown) {
+        return
+      }
+      shuttingDown = true
+
       process.stdout.write("\r")
       consola.info("shutting down highstate designer...")
 

package/src/commands/update.ts

@@ -6,6 +6,7 @@ import {
   applyOverrides,
   buildOverrides,
   fetchManifest,
+  fetchNpmPackument,
   getDependencyRange,
   getProjectPlatformVersion,
   logger,
@@ -52,45 +53,25 @@ export class UpdateCommand extends Command {
     const updatePlatform = this.platformOnly || !this.stdlibOnly
     const updateStdlib = this.stdlibOnly || !this.platformOnly
 
+    let currentPlatformVersion: string | undefined
+    let resolvedStdlibVersion = this.stdlibVersion
+
     if (this.stdlibOnly) {
-      const currentPlatformVersion = await getProjectPlatformVersion(projectRoot)
-      if (!currentPlatformVersion) {
+      const projectPlatformVersion = await getProjectPlatformVersion(projectRoot)
+      if (!projectPlatformVersion) {
         throw new Error('Current platform version is not set in overrides for "@highstate/pulumi"')
       }
 
-      const targetStdlibVersion = (this.stdlibVersion ?? "").trim()
-      if (targetStdlibVersion.length === 0) {
-        throw new Error('Flag "--stdlib-version" must be provided when using "--stdlib"')
-      }
-
-      const stdlibManifest = await fetchManifest("@highstate/library", targetStdlibVersion)
-      const supportedPlatformRange = getDependencyRange(stdlibManifest, "@highstate/pulumi")
-      if (!supportedPlatformRange) {
-        throw new Error(
-          `Unable to infer "@highstate/pulumi" version from "@highstate/library@${targetStdlibVersion}"`,
-        )
-      }
-
-      const validPlatform = semver.valid(currentPlatformVersion)
-      if (!validPlatform) {
-        throw new Error(
-          `Current platform version is not a valid semver "${currentPlatformVersion}"`,
-        )
-      }
-
-      const ok = semver.satisfies(validPlatform, supportedPlatformRange, {
-        includePrerelease: true,
+      currentPlatformVersion = projectPlatformVersion
+      resolvedStdlibVersion = await resolveCompatibleStdlibVersion({
+        currentPlatformVersion: projectPlatformVersion,
+        stdlibVersion: this.stdlibVersion,
       })
-      if (!ok) {
-        throw new Error(
-          `Current platform version "${currentPlatformVersion}" does not satisfy requirement "${supportedPlatformRange}"`,
-        )
-      }
     }
 
     const bundle = await resolveVersionBundle({
-      platformVersion: updatePlatform ? this.platformVersion : undefined,
-      stdlibVersion: updateStdlib ? this.stdlibVersion : undefined,
+      platformVersion: updatePlatform ? this.platformVersion : currentPlatformVersion,
+      stdlibVersion: updateStdlib ? resolvedStdlibVersion : undefined,
     })
 
     const overrides = buildOverrides(bundle)
@@ -126,6 +107,80 @@ export class UpdateCommand extends Command {
   }
 }
 
+type ResolveCompatibleStdlibVersionArgs = {
+  currentPlatformVersion: string
+  stdlibVersion?: string
+}
+
+async function resolveCompatibleStdlibVersion(
+  args: ResolveCompatibleStdlibVersionArgs,
+): Promise<string> {
+  const validPlatform = semver.valid(args.currentPlatformVersion)
+  if (!validPlatform) {
+    throw new Error(
+      `Current platform version is not a valid semver "${args.currentPlatformVersion}"`,
+    )
+  }
+
+  const targetStdlibVersion = args.stdlibVersion?.trim()
+  if (targetStdlibVersion) {
+    await assertStdlibSupportsPlatform({
+      currentPlatformVersion: validPlatform,
+      stdlibVersion: targetStdlibVersion,
+    })
+
+    return targetStdlibVersion
+  }
+
+  const packument = await fetchNpmPackument("@highstate/library")
+  const sortedVersions = Object.entries(packument.versions ?? {})
+    .filter(([version]) => semver.valid(version))
+    .sort(([a], [b]) => semver.rcompare(a, b))
+
+  for (const [stdlibVersion, stdlibManifest] of sortedVersions) {
+    const supportedPlatformRange = getDependencyRange(stdlibManifest, "@highstate/pulumi")
+    if (!supportedPlatformRange) {
+      continue
+    }
+
+    const ok = semver.satisfies(validPlatform, supportedPlatformRange, {
+      includePrerelease: true,
+    })
+
+    if (ok) {
+      return stdlibVersion
+    }
+  }
+
+  throw new Error(
+    `Unable to find "@highstate/library" version compatible with platform "${validPlatform}"`,
+  )
+}
+
+type StdlibPlatformCompatibilityArgs = {
+  currentPlatformVersion: string
+  stdlibVersion: string
+}
+
+async function assertStdlibSupportsPlatform(args: StdlibPlatformCompatibilityArgs): Promise<void> {
+  const stdlibManifest = await fetchManifest("@highstate/library", args.stdlibVersion)
+  const supportedPlatformRange = getDependencyRange(stdlibManifest, "@highstate/pulumi")
+  if (!supportedPlatformRange) {
+    throw new Error(
+      `Unable to infer "@highstate/pulumi" version from "@highstate/library@${args.stdlibVersion}"`,
+    )
+  }
+
+  const ok = semver.satisfies(args.currentPlatformVersion, supportedPlatformRange, {
+    includePrerelease: true,
+  })
+  if (!ok) {
+    throw new Error(
+      `Current platform version "${args.currentPlatformVersion}" does not satisfy requirement "${supportedPlatformRange}"`,
+    )
+  }
+}
+
 async function assertPackageJsonExists(projectRoot: string): Promise<void> {
   try {
     await readFile(`${projectRoot}/package.json`, "utf8")